Skip to content

Commit b9497fd

Browse files
Merge pull request #22 from opf/fix/override-file
fix: ignore non-existing local override file
2 parents 184e7cf + d839d7d commit b9497fd

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ charts/openproject/charts/*
33
tmpcharts-*/
44
helmfile-*/
55
tmp/
6-
environments/override/*
7-
!environments/override/config.yaml.example
6+
environments/override.yaml

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ make teardown-all
7575
## Configuring the Deployment
7676

7777
⚠️ Do not edit `charts/opnc-integration/values.yaml` directly.
78-
All configuration changes must go into [environments/override/config.yaml](https://github.com/saw-jan/opnc-helm-chart/blob/master/environments/override/config.yaml), which will override the default values for all environments. Also, the changes in this file will not be seen by git, so it is convenient and safe to use it for changing any configuration.
78+
All configuration changes must go into `environments/override.yaml`, which will override the default values for all environments. Also, the changes in this file will not be seen by git, so it is convenient and safe to use it for changing any configuration.
7979

8080
Usage:
8181

82-
Copy the [config.yaml.example](./environments/override/config.yaml.example) to `environments/override/config.yaml` and add the configs as needed.
82+
Copy the [override.yaml.example](./environments/override.yaml.example) to `environments/override.yaml` and add the configs as needed.
8383

8484
```yaml
85-
# Example: environments/override/config.yaml
85+
# Example: environments/override.yaml
8686
integration:
8787
setupMethod: 'sso-external'
8888

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# For the available configuration options, see: environments/default/config.yaml
55
# NOTE: the config structure must be the same as in the above config file.
66

7-
# Usage: copy 'config.yaml.example' to 'config.yaml'
7+
# Usage: copy 'override.yaml.example' to 'override.yaml'

helmfile.yaml.gotmpl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
---
22
environments:
33
default:
4+
missingFileHandler: Warn
45
values:
56
- environments/default/config.yaml
6-
- environments/override/config.yaml
7+
- environments/override.yaml
78
dev:
9+
missingFileHandler: Warn
810
values:
911
- environments/default/config.yaml
1012
- environments/dev/config.yaml
11-
- environments/override/config.yaml
13+
- environments/override.yaml
1214
ci:
15+
missingFileHandler: Warn
1316
values:
1417
- environments/default/config.yaml
1518
- environments/ci/config.yaml.gotmpl
16-
- environments/override/config.yaml
19+
- environments/override.yaml
1720
dev-op-standalone:
21+
missingFileHandler: Warn
1822
values:
1923
- environments/default/config.yaml
2024
- environments/dev-op-standalone/config.yaml
21-
- environments/override/config.yaml
25+
- environments/override.yaml
2226
---
2327
repositories:
2428
# Issues:

0 commit comments

Comments
 (0)