vsechny budou stejny

This commit is contained in:
Jan Husak
2025-04-09 16:05:42 +02:00
parent 8c6c73ed49
commit 28afce418e
2 changed files with 9 additions and 18 deletions

View File

@@ -43,14 +43,14 @@ spec:
# As a side effect, it also allows access to previously defined values, like '.values.stageName' # As a side effect, it also allows access to previously defined values, like '.values.stageName'
elements: elements:
# The selector also had troubles with booleans vs. strings, hence the 'yes' and not 'true' # The selector also had troubles with booleans vs. strings, hence the 'yes' and not 'true'
- enabled: '{{ dig "clusters" .values.stageName .values.clusterName "enabled" false . | ternary "yes" "" }}' - enabled: '{{ dig "clusters" .values.clusterName "enabled" false . | ternary "yes" "" }}'
appName: "{{ .path.basename }}" appName: "{{ .path.basename }}"
selector: selector:
matchLabels: matchLabels:
enabled: "yes" enabled: "yes"
template: template:
metadata: metadata:
name: "{{ .path.basename }}-{{.values.stageName }}-{{ .values.clusterName }}" name: "{{ .path.basename }}-{{ .values.clusterName }}"
spec: spec:
project: default project: default
destination: destination:
@@ -68,12 +68,12 @@ spec:
# First source is for value files # First source is for value files
# Default revision is HEAD but can be overriden with clusters.${name}.valuesRevision # Default revision is HEAD but can be overriden with clusters.${name}.valuesRevision
- repoURL: https://github.com/ysoftdevs/argo-poc.git - repoURL: https://github.com/ysoftdevs/argo-poc.git
targetRevision: '{{ dig "stages" .values.stageName "valuesRevision" (dig "valuesRevision" "" .source) . }}' targetRevision: '{{ dig "stages" .values.clusterName "valuesRevision" (dig "valuesRevision" "" .source) . }}'
ref: values ref: values
# Second source is for chart # Second source is for chart
# Default revision is .source.targetRevision but can be overriden with clusters.${name}.chartRevision # Default revision is .source.targetRevision but can be overriden with clusters.${name}.chartRevision
- repoURL: "{{ .source.repoURL }}" - repoURL: "{{ .source.repoURL }}"
targetRevision: '{{ dig "stages" .values.stageName "chartRevision" (dig "chartRevision" "" .source) . }}' targetRevision: '{{ dig "stages" .values.clusterName "chartRevision" (dig "chartRevision" "" .source) . }}'
ref: chart ref: chart
chart: '{{ default "" .source.chart }}' chart: '{{ default "" .source.chart }}'
path: '{{ default "" .source.path }}' path: '{{ default "" .source.path }}'

View File

@@ -21,21 +21,12 @@
"values/app-version/%stage%-values.yaml" "values/app-version/%stage%-values.yaml"
], ],
"clusters": { "clusters": {
"dev": { "control-plane-dev": {
"control-plane-dev": { "enabled": true,
"enabled": true "revision": "test"
},
"ohio": {
"enabled": false
}
}, },
"prod": { "ohio": {
"control-plane": { "enabled": false
"enabled": true
},
"ireland": {
"enabled": false
}
} }
} }
} }