Skip to content

Commit e3ed1f8

Browse files
jvanzjvanz
authored
Merge pull request #386 from jvanz/main
fix(ci): fix broken updatecli yaml files.
2 parents d61eab8 + 050dd71 commit e3ed1f8

File tree

2 files changed

+34
-32
lines changed

2 files changed

+34
-32
lines changed

‎updatecli/updatecli.d/major-kubewarden-update.yaml

+17-16
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ sources:
1010
- trimsuffix: " "
1111
spec:
1212
file: "file://charts/kubewarden-defaults/Chart.yaml"
13-
key: "version"
13+
key: "$.version"
1414

1515
defaultChartAppVersion:
1616
name: Load chart app version
1717
kind: yaml
1818
spec:
1919
file: "file://charts/kubewarden-defaults/Chart.yaml"
20-
key: "appVersion"
20+
key: "$.appVersion"
2121

2222
defaultValuesFile:
2323
kind: yaml
2424
spec:
2525
file: "charts/kubewarden-defaults/values.yaml"
26-
key: "policyServer.image.tag"
26+
key: "$.policyServer.image.tag"
2727

2828
controllerChartAppVersion:
2929
name: Load chart app version
3030
kind: yaml
3131
spec:
3232
file: "file://charts/kubewarden-controller/Chart.yaml"
33-
key: "appVersion"
33+
key: "$.appVersion"
3434

3535
controllerChartVersion:
3636
name: Load controller chart version
@@ -41,19 +41,19 @@ sources:
4141
- trimsuffix: " "
4242
spec:
4343
file: "file://charts/kubewarden-controller/Chart.yaml"
44-
key: "version"
44+
key: "$.version"
4545

4646
controllerImageValuesFile:
4747
kind: yaml
4848
spec:
4949
file: "charts/kubewarden-controller/values.yaml"
50-
key: "image.tag"
50+
key: "$.image.tag"
5151

5252
auditScannerImageValuesFile:
5353
kind: yaml
5454
spec:
5555
file: "charts/kubewarden-controller/values.yaml"
56-
key: "auditScanner.image.tag"
56+
key: "$.auditScanner.image.tag"
5757

5858
conditions:
5959
# All the major components must have the same tag
@@ -94,14 +94,15 @@ conditions:
9494
kind: "semver"
9595
pattern: "{{ requiredEnv .releaseVersion }}"
9696

97+
targets:
9798
defaultUpdateValuesFile:
9899
kind: yaml
99100
name: "Update container image in the values.yaml file"
100101
sourceid: defaultValuesFile
101102
scmid: "default"
102103
spec:
103104
file: "charts/kubewarden-defaults/values.yaml"
104-
key: "policyServer.image.tag"
105+
key: "$.policyServer.image.tag"
105106
value: "{{ requiredEnv .releaseVersion }}"
106107

107108
defaultChartVersionUpdate:
@@ -111,7 +112,7 @@ conditions:
111112
scmid: "default"
112113
spec:
113114
file: "file://charts/kubewarden-defaults/Chart.yaml"
114-
key: "version"
115+
key: "$.version"
115116

116117
defaultChartVersionUpdate2:
117118
name: Bump defaults chart version in annotations
@@ -120,7 +121,7 @@ conditions:
120121
scmid: "default"
121122
spec:
122123
file: "file://charts/kubewarden-defaults/Chart.yaml"
123-
key: 'annotations.catalog\.cattle\.io/upstream-version'
124+
key: "$.annotations.'catalog.cattle.io/upstream-version'"
124125

125126
defaultChartAppVersionUpdate:
126127
name: Bump defaults chart app version
@@ -129,7 +130,7 @@ conditions:
129130
scmid: "default"
130131
spec:
131132
file: "file://charts/kubewarden-defaults/Chart.yaml"
132-
key: "appVersion"
133+
key: "$.appVersion"
133134
value: "{{ requiredEnv .releaseVersion }}"
134135

135136
controllerImageUpdateValuesFile:
@@ -139,7 +140,7 @@ conditions:
139140
scmid: "default"
140141
spec:
141142
file: "charts/kubewarden-controller/values.yaml"
142-
key: "image.tag"
143+
key: "$.image.tag"
143144
value: "{{ requiredEnv .releaseVersion }}"
144145

145146
controllerChartAppVersionUpdate:
@@ -149,7 +150,7 @@ conditions:
149150
scmid: "default"
150151
spec:
151152
file: "file://charts/kubewarden-controller/Chart.yaml"
152-
key: "appVersion"
153+
key: "$.appVersion"
153154
value: "{{ requiredEnv .releaseVersion }}"
154155

155156
auditScannerImageUpdateValuesFile:
@@ -159,7 +160,7 @@ conditions:
159160
scmid: "default"
160161
spec:
161162
file: "charts/kubewarden-controller/values.yaml"
162-
key: "auditScanner.image.tag"
163+
key: "$.auditScanner.image.tag"
163164
value: "{{ requiredEnv .releaseVersion }}"
164165

165166
controllerChartVersionUpdate:
@@ -169,7 +170,7 @@ conditions:
169170
scmid: "default"
170171
spec:
171172
file: "file://charts/kubewarden-controller/Chart.yaml"
172-
key: "version"
173+
key: "$.version"
173174

174175
controllerChartVersionUpdate2:
175176
name: Bump controller chart version in annotations
@@ -178,7 +179,7 @@ conditions:
178179
scmid: "default"
179180
spec:
180181
file: "file://charts/kubewarden-controller/Chart.yaml"
181-
key: 'annotations.catalog\.cattle\.io/upstream-version'
182+
key: "$.annotations.'catalog.cattle.io/upstream-version'"
182183

183184
actions:
184185
createUpdatePR:

‎updatecli/updatecli.d/prerelease-kubewarden-update.yaml

+17-16
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ sources:
1111
- trimsuffix: " "
1212
spec:
1313
file: "file://charts/kubewarden-defaults/Chart.yaml"
14-
key: "version"
14+
key: "$.version"
1515

1616
defaultChartAppVersion:
1717
name: Load chart app version
1818
kind: yaml
1919
spec:
2020
file: "file://charts/kubewarden-defaults/Chart.yaml"
21-
key: "appVersion"
21+
key: "$.appVersion"
2222

2323
defaultValuesFile:
2424
kind: yaml
2525
spec:
2626
file: "charts/kubewarden-defaults/values.yaml"
27-
key: "policyServer.image.tag"
27+
key: "$.policyServer.image.tag"
2828

2929
controllerChartAppVersion:
3030
name: Load chart app version
3131
kind: yaml
3232
spec:
3333
file: "file://charts/kubewarden-controller/Chart.yaml"
34-
key: "appVersion"
34+
key: "$.appVersion"
3535

3636
controllerChartVersion:
3737
name: Load controller chart version
@@ -43,19 +43,19 @@ sources:
4343
- trimsuffix: " "
4444
spec:
4545
file: "file://charts/kubewarden-controller/Chart.yaml"
46-
key: "version"
46+
key: "$.version"
4747

4848
controllerImageValuesFile:
4949
kind: yaml
5050
spec:
5151
file: "charts/kubewarden-controller/values.yaml"
52-
key: "image.tag"
52+
key: "$.image.tag"
5353

5454
auditScannerImageValuesFile:
5555
kind: yaml
5656
spec:
5757
file: "charts/kubewarden-controller/values.yaml"
58-
key: "auditScanner.image.tag"
58+
key: "$.auditScanner.image.tag"
5959

6060
conditions:
6161
# All the major components must have the same tag
@@ -96,14 +96,15 @@ conditions:
9696
kind: "semver"
9797
pattern: "{{ requiredEnv .releaseVersion }}"
9898

99+
targets:
99100
defaultUpdateValuesFile:
100101
kind: yaml
101102
name: "Update container image in the values.yaml file"
102103
sourceid: defaultValuesFile
103104
scmid: "default"
104105
spec:
105106
file: "charts/kubewarden-defaults/values.yaml"
106-
key: "policyServer.image.tag"
107+
key: "$.policyServer.image.tag"
107108
value: "{{ requiredEnv .releaseVersion }}"
108109

109110
defaultChartVersionUpdate:
@@ -113,7 +114,7 @@ conditions:
113114
scmid: "default"
114115
spec:
115116
file: "file://charts/kubewarden-defaults/Chart.yaml"
116-
key: "version"
117+
key: "$.version"
117118

118119
defaultChartVersionUpdate2:
119120
name: Bump defaults chart version in annotations
@@ -122,7 +123,7 @@ conditions:
122123
scmid: "default"
123124
spec:
124125
file: "file://charts/kubewarden-defaults/Chart.yaml"
125-
key: 'annotations.catalog\.cattle\.io/upstream-version'
126+
key: "$.annotations.'catalog.cattle.io/upstream-version'"
126127

127128
defaultChartAppVersionUpdate:
128129
name: Bump defaults chart app version
@@ -131,7 +132,7 @@ conditions:
131132
scmid: "default"
132133
spec:
133134
file: "file://charts/kubewarden-defaults/Chart.yaml"
134-
key: "appVersion"
135+
key: "$.appVersion"
135136
value: "{{ requiredEnv .releaseVersion }}"
136137

137138
controllerImageUpdateValuesFile:
@@ -141,7 +142,7 @@ conditions:
141142
scmid: "default"
142143
spec:
143144
file: "charts/kubewarden-controller/values.yaml"
144-
key: "image.tag"
145+
key: "$.image.tag"
145146
value: "{{ requiredEnv .releaseVersion }}"
146147

147148
auditScannerImageUpdateValuesFile:
@@ -151,7 +152,7 @@ conditions:
151152
scmid: "default"
152153
spec:
153154
file: "charts/kubewarden-controller/values.yaml"
154-
key: "auditScanner.image.tag"
155+
key: "$.auditScanner.image.tag"
155156
value: "{{ requiredEnv .releaseVersion }}"
156157

157158
controllerChartAppVersionUpdate:
@@ -161,7 +162,7 @@ conditions:
161162
scmid: "default"
162163
spec:
163164
file: "file://charts/kubewarden-controller/Chart.yaml"
164-
key: "appVersion"
165+
key: "$.appVersion"
165166
value: "{{ requiredEnv .releaseVersion }}"
166167

167168
controllerChartVersionUpdate:
@@ -171,7 +172,7 @@ conditions:
171172
scmid: "default"
172173
spec:
173174
file: "file://charts/kubewarden-controller/Chart.yaml"
174-
key: "version"
175+
key: "$.version"
175176

176177
controllerChartVersionUpdate2:
177178
name: Bump controller chart version in annotations
@@ -180,7 +181,7 @@ conditions:
180181
scmid: "default"
181182
spec:
182183
file: "file://charts/kubewarden-controller/Chart.yaml"
183-
key: 'annotations.catalog\.cattle\.io/upstream-version'
184+
key: "$.annotations.'catalog.cattle.io/upstream-version'"
184185

185186
actions:
186187
createUpdatePR:

0 commit comments

Comments
 (0)