Skip to content

Commit e362718

Browse files
Fix test failures from removed image references (#44932)
Tests were failing because `wgetImage` and other deprecated images were removed from `values.yaml` but their references remained in templates and schemas. **Changes:** - Replace `wgetImage` → `ubuntuImage` in clickhouse/solr wait containers (`_dbWait.tpl`) - Remove orphaned schema files: `wgetImage`, `alpineImage`, `scratchImage`, `yqImage`, `openvpnImage`, `wireguardImage`, `redisClientImage` - Clean schema references in `values.schema.json` **Before:** ```yaml {{- define "tc.v1.common.lib.deps.wait.clickhouse" -}} imageSelector: wgetImage # Image no longer exists ``` **After:** ```yaml {{- define "tc.v1.common.lib.deps.wait.clickhouse" -}} imageSelector: ubuntuImage # Uses existing ubuntu image with wget ``` All 1346 unit tests now pass. <!-- START COPILOT CODING AGENT TIPS --> --- 💬 We'd love your input! Share your thoughts on Copilot coding agent in our [2 minute survey](https://gh.io/copilot-coding-agent-survey). --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: PrivatePuffin <7613738+PrivatePuffin@users.noreply.github.com>
1 parent 14493f5 commit e362718

File tree

9 files changed

+2
-170
lines changed

9 files changed

+2
-170
lines changed

charts/library/common/schemas/images/alpineImage.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/library/common/schemas/images/openvpnImage.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/library/common/schemas/images/redisClientImage.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/library/common/schemas/images/scratchImage.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/library/common/schemas/images/wgetImage.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/library/common/schemas/images/wireguardImage.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/library/common/schemas/images/yqImage.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

charts/library/common/templates/lib/dependencies/_dbWait.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ command:
236236
{{- define "tc.v1.common.lib.deps.wait.clickhouse" -}}
237237
enabled: true
238238
type: system
239-
imageSelector: wgetImage
239+
imageSelector: ubuntuImage
240240
securityContext:
241241
runAsUser: 568
242242
runAsGroup: 568
@@ -280,7 +280,7 @@ args:
280280
{{- define "tc.v1.common.lib.deps.wait.solr" -}}
281281
enabled: true
282282
type: system
283-
imageSelector: wgetImage
283+
imageSelector: ubuntuImage
284284
securityContext:
285285
runAsUser: 568
286286
runAsGroup: 568

charts/library/common/values.schema.json

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -144,30 +144,14 @@
144144
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/codeserverImage.json",
145145
"description": "Configuration for `codeserverImage`."
146146
},
147-
"alpineImage": {
148-
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/alpineImage.json",
149-
"description": "Configuration for `alpineImage`."
150-
},
151147
"ubuntuImage": {
152148
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/ubuntuImage.json",
153149
"description": "Configuration for `ubuntuImage`."
154150
},
155-
"scratchImage": {
156-
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/scratchImage.json",
157-
"description": "Configuration for `scratchImage`."
158-
},
159151
"kubectlImage": {
160152
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/kubectlImage.json",
161153
"description": "Configuration for `kubectlImage`."
162154
},
163-
"wgetImage": {
164-
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/wgetImage.json",
165-
"description": "Configuration for `wgetImage`."
166-
},
167-
"yqImage": {
168-
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/yqImage.json",
169-
"description": "Configuration for `yqImage`."
170-
},
171155
"postgresClientImage": {
172156
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/postgresClientImage.json",
173157
"description": "Configuration for `postgresClientImage`."
@@ -176,10 +160,6 @@
176160
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/mariadbClientImage.json",
177161
"description": "Configuration for `mariadbClientImage`."
178162
},
179-
"redisClientImage": {
180-
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/redisClientImage.json",
181-
"description": "Configuration for `redisClientImage`."
182-
},
183163
"valkeyClientImage": {
184164
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/valkeyClientImage.json",
185165
"description": "Configuration for `valkeyClientImage`."
@@ -220,14 +200,6 @@
220200
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/postgresVectorchord16Image.json",
221201
"description": "Configuration for `postgresVectorchord16Image`."
222202
},
223-
"openvpnImage": {
224-
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/openvpnImage.json",
225-
"description": "Configuration for `openvpnImage`."
226-
},
227-
"wireguardImage": {
228-
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/images/wireguardImage.json",
229-
"description": "Configuration for `wireguardImage`."
230-
},
231203
"ingress": {
232204
"$ref": "file:///home/runner/work/truecharts/truecharts/charts/library/common/schemas/ingress.json",
233205
"description": "Create Ingress objects"

0 commit comments

Comments
 (0)