Skip to content

Commit 5e0e45b

Browse files
committed
refactor: Drop updatecli automations for chart-values.yaml
Signed-off-by: Víctor Cuadrado Juan <[email protected]>
1 parent 9e2e01b commit 5e0e45b

7 files changed

+109
-383
lines changed

updatecli/updatecli.d/major-kubewarden-update-with-crd-update.yaml

+32-82
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ sources:
55
name: Load chart version
66
kind: yaml
77
transformers:
8-
- semverinc: '{{ requiredEnv .semverinc }}'
9-
- addsuffix: '{{ requiredEnv .prerelease_suffix }}'
10-
- trimsuffix: ' '
8+
- semverinc: "{{ requiredEnv .semverinc }}"
9+
- addsuffix: "{{ requiredEnv .prerelease_suffix }}"
10+
- trimsuffix: " "
1111
spec:
1212
file: "file://charts/kubewarden-defaults/Chart.yaml"
1313
key: "version"
@@ -19,17 +19,11 @@ sources:
1919
file: "file://charts/kubewarden-defaults/Chart.yaml"
2020
key: "appVersion"
2121

22-
defaultChartValuesFile:
23-
kind: yaml
24-
spec:
25-
file: "charts/kubewarden-defaults/chart-values.yaml"
26-
key: 'policyServer.image.tag'
27-
2822
defaultValuesFile:
2923
kind: yaml
3024
spec:
3125
file: "charts/kubewarden-defaults/values.yaml"
32-
key: 'policyServer.image.tag'
26+
key: "policyServer.image.tag"
3327

3428
controllerChartAppVersion:
3529
name: Load chart app version
@@ -42,31 +36,19 @@ sources:
4236
name: Load controller chart version
4337
kind: yaml
4438
transformers:
45-
- semverinc: '{{ requiredEnv .semverinc }}'
46-
- addsuffix: '{{ requiredEnv .prerelease_suffix }}'
47-
- trimsuffix: ' '
39+
- semverinc: "{{ requiredEnv .semverinc }}"
40+
- addsuffix: "{{ requiredEnv .prerelease_suffix }}"
41+
- trimsuffix: " "
4842
spec:
4943
file: "file://charts/kubewarden-controller/Chart.yaml"
5044
key: "version"
5145

52-
controllerImageChartValuesFile:
53-
kind: yaml
54-
spec:
55-
file: "charts/kubewarden-controller/chart-values.yaml"
56-
key: "image.tag"
57-
5846
controllerImageValuesFile:
5947
kind: yaml
6048
spec:
6149
file: "charts/kubewarden-controller/values.yaml"
6250
key: "image.tag"
6351

64-
auditScannerImageChartValuesFile:
65-
kind: yaml
66-
spec:
67-
file: "charts/kubewarden-controller/chart-values.yaml"
68-
key: "auditScanner.image.tag"
69-
7052
auditScannerImageValuesFile:
7153
kind: yaml
7254
spec:
@@ -76,9 +58,9 @@ sources:
7658
crdChartVersion:
7759
kind: yaml
7860
transformers:
79-
- semverinc: '{{ requiredEnv .semverinc }}'
80-
- addsuffix: '{{ requiredEnv .prerelease_suffix }}'
81-
- trimsuffix: ' '
61+
- semverinc: "{{ requiredEnv .semverinc }}"
62+
- addsuffix: "{{ requiredEnv .prerelease_suffix }}"
63+
- trimsuffix: " "
8264
spec:
8365
file: "charts/kubewarden-crds/Chart.yaml"
8466
key: "version"
@@ -90,7 +72,6 @@ sources:
9072
file: "file://charts/kubewarden-crds/Chart.yaml"
9173
key: "appVersion"
9274

93-
9475
conditions:
9576
# All the major components must have the same tag
9677
kwctlTag:
@@ -101,7 +82,7 @@ conditions:
10182
spec:
10283
versionfilter:
10384
kind: "semver"
104-
pattern: '{{ requiredEnv .releaseVersion }}'
85+
pattern: "{{ requiredEnv .releaseVersion }}"
10586
kubewardenControllerTag:
10687
name: Test if kubewarden-controller has the required tag
10788
disablesourceinput: true
@@ -110,7 +91,7 @@ conditions:
11091
spec:
11192
versionfilter:
11293
kind: "semver"
113-
pattern: '{{ requiredEnv .releaseVersion }}'
94+
pattern: "{{ requiredEnv .releaseVersion }}"
11495
policyServerTag:
11596
name: Test if Policy Server has the required tag
11697
disablesourceinput: true
@@ -119,7 +100,7 @@ conditions:
119100
spec:
120101
versionfilter:
121102
kind: "semver"
122-
pattern: '{{ requiredEnv .releaseVersion }}'
103+
pattern: "{{ requiredEnv .releaseVersion }}"
123104
auditScannerTag:
124105
name: Test if audit-scanner has the required tag
125106
disablesourceinput: true
@@ -128,7 +109,7 @@ conditions:
128109
spec:
129110
versionfilter:
130111
kind: "semver"
131-
pattern: '{{ requiredEnv .releaseVersion }}'
112+
pattern: "{{ requiredEnv .releaseVersion }}"
132113

133114
targets:
134115
installCRD:
@@ -166,7 +147,7 @@ targets:
166147
scmid: "default"
167148
spec:
168149
file: "file://charts/kubewarden-crds/Chart.yaml"
169-
key: 'version'
150+
key: "version"
170151
value: '{{ source "crdChartVersion" }}'
171152

172153
updateCRDChartAppVersion:
@@ -177,17 +158,7 @@ targets:
177158
spec:
178159
file: "file://charts/kubewarden-crds/Chart.yaml"
179160
key: "appVersion"
180-
value: '{{ requiredEnv .releaseVersion }}'
181-
182-
defaultUpdateChartValuesFile:
183-
name: "Update container image in the chart-values.yaml file"
184-
kind: yaml
185-
sourceid: defaultChartValuesFile
186-
scmid: "default"
187-
spec:
188-
file: "charts/kubewarden-defaults/chart-values.yaml"
189-
key: 'policyServer.image.tag'
190-
value: '{{ requiredEnv .releaseVersion }}'
161+
value: "{{ requiredEnv .releaseVersion }}"
191162

192163
defaultUpdateValuesFile:
193164
kind: yaml
@@ -196,8 +167,8 @@ targets:
196167
scmid: "default"
197168
spec:
198169
file: "charts/kubewarden-defaults/values.yaml"
199-
key: 'policyServer.image.tag'
200-
value: '{{ requiredEnv .releaseVersion }}'
170+
key: "policyServer.image.tag"
171+
value: "{{ requiredEnv .releaseVersion }}"
201172

202173
defaultChartVersionUpdate:
203174
name: Bump defaults chart version
@@ -216,7 +187,7 @@ targets:
216187
spec:
217188
file: "file://charts/kubewarden-defaults/Chart.yaml"
218189
key: "appVersion"
219-
value: '{{ requiredEnv .releaseVersion }}'
190+
value: "{{ requiredEnv .releaseVersion }}"
220191

221192
defaultChartVersionUpdate2:
222193
name: Bump defaults chart version in annotations
@@ -237,36 +208,15 @@ targets:
237208
key: 'annotations.catalog\.cattle\.io/auto-install'
238209
value: 'kubewarden-crds={{ source "crdChartVersion" }}'
239210

240-
241-
controllerImageUpdateChartValuesFile:
242-
name: "Update container image in the chart-values.yaml file"
243-
kind: yaml
244-
sourceid: controllerImageChartValuesFile
245-
scmid: "default"
246-
spec:
247-
file: "charts/kubewarden-controller/chart-values.yaml"
248-
key: 'image.tag'
249-
value: '{{ requiredEnv .releaseVersion }}'
250-
251211
controllerImageUpdateValuesFile:
252212
kind: yaml
253213
name: "Update container image in the values.yaml file"
254214
sourceid: controllerImageValuesFile
255215
scmid: "default"
256216
spec:
257217
file: "charts/kubewarden-controller/values.yaml"
258-
key: 'image.tag'
259-
value: '{{ requiredEnv .releaseVersion }}'
260-
261-
auditScannerImageUpdateChartValuesFile:
262-
name: "Update container image in the chart-values.yaml file"
263-
kind: yaml
264-
sourceid: auditScannerImageChartValuesFile
265-
scmid: "default"
266-
spec:
267-
file: "charts/kubewarden-controller/chart-values.yaml"
268-
key: 'auditScanner.image.tag'
269-
value: '{{ requiredEnv .releaseVersion }}'
218+
key: "image.tag"
219+
value: "{{ requiredEnv .releaseVersion }}"
270220

271221
auditScannerImageUpdateValuesFile:
272222
kind: yaml
@@ -275,8 +225,8 @@ targets:
275225
scmid: "default"
276226
spec:
277227
file: "charts/kubewarden-controller/values.yaml"
278-
key: 'auditScanner.image.tag'
279-
value: '{{ requiredEnv .releaseVersion }}'
228+
key: "auditScanner.image.tag"
229+
value: "{{ requiredEnv .releaseVersion }}"
280230

281231
controllerChartAppVersionUpdate:
282232
name: Bump controller chart app version
@@ -286,7 +236,7 @@ targets:
286236
spec:
287237
file: "file://charts/kubewarden-controller/Chart.yaml"
288238
key: "appVersion"
289-
value: '{{ requiredEnv .releaseVersion }}'
239+
value: "{{ requiredEnv .releaseVersion }}"
290240

291241
controllerChartVersionUpdate:
292242
name: Bump controller chart version
@@ -343,20 +293,20 @@ scms:
343293
kwctlGit:
344294
kind: "git"
345295
spec:
346-
url: "https://github.com/{{ requiredEnv .github.user }}/kwctl.git"
347-
branch: "main"
296+
url: "https://github.com/{{ requiredEnv .github.user }}/kwctl.git"
297+
branch: "main"
348298
kubewardenControllerGit:
349299
kind: "git"
350300
spec:
351-
url: "https://github.com/{{ requiredEnv .github.user }}/kubewarden-controller.git"
352-
branch: "main"
301+
url: "https://github.com/{{ requiredEnv .github.user }}/kubewarden-controller.git"
302+
branch: "main"
353303
policyServerGit:
354304
kind: "git"
355305
spec:
356-
url: "https://github.com/{{ requiredEnv .github.user }}/policy-server.git"
357-
branch: "main"
306+
url: "https://github.com/{{ requiredEnv .github.user }}/policy-server.git"
307+
branch: "main"
358308
auditScannerGit:
359309
kind: "git"
360310
spec:
361-
url: "https://github.com/{{ requiredEnv .github.user }}/audit-scanner.git"
362-
branch: "main"
311+
url: "https://github.com/{{ requiredEnv .github.user }}/audit-scanner.git"
312+
branch: "main"

0 commit comments

Comments
 (0)