Skip to content

Commit 093571d

Browse files
chrissetoRafalKorepta
chrisseto
authored and
RafalKorepta
committed
operator: always refer to localhost/redpanda-operator:dev in tests
Prior to this commit the majority of tests in this repository would run using the previously released version of the operator due to the redpanda's chart containing a hard coded version. Upon attempting an operator release and needing to bump that image, we discovered a nasty circular dependency. This commit updates all failing tests to refer to `localhost/redpanda-operator:dev` to ensure that any changes to the sidecar get tests and to avoid circular dependencies.
1 parent d1dd2ab commit 093571d

File tree

20 files changed

+181
-167
lines changed

20 files changed

+181
-167
lines changed

‎.changes/unreleased/charts-redpanda-Removed-20250410-133244.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
project: charts/redpanda
2+
kind: Removed
3+
body: Removed regex validation of all image tags.
4+
time: 2025-04-10T13:32:44.183762-04:00

‎Taskfile.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ tasks:
162162
# In integration tests, the operator itself will be run from the go test process.
163163
- build:image
164164
cmds:
165+
- task: charts:kind-cluster
166+
- kind load docker-image localhost/redpanda-operator:dev
165167
- task: test:unit
166168
vars:
167169
GO_TEST_RUNNER:
@@ -170,11 +172,13 @@ tasks:
170172

171173
test:acceptance:
172174
desc: "Run all acceptance tests (~90m)"
175+
deps:
176+
- build:image
173177
vars:
174178
GO_TEST_RUNNER: '{{default "go test" .GO_TEST_RUNNER}}'
175179
CLI_ARGS: '{{.CLI_ARGS}} -tags=acceptance -run "^TestAcceptance" -timeout 20m -v'
176180
cmds:
177-
- task: build:image
181+
- task: charts:kind-cluster
178182
- kind load docker-image localhost/redpanda-operator:dev
179183
- task: test:unit
180184
vars:

‎charts/redpanda/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
55
and is generated by [Changie](https://github.com/miniscruff/changie).
66

77

8+
## Unreleased
9+
### Removed
10+
* Removed regex validation of all image tags.
11+
812
## v5.9.24 - 2025-05-27
913
### Changed
1014
* Bump Redpanda operator side car container tag to `v2.3.11-24.3.14`.

‎charts/redpanda/README.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -322,15 +322,9 @@ Redpanda Docker image settings.
322322
**Default:**
323323

324324
```
325-
{"pullPolicy":"IfNotPresent","repository":"docker.redpanda.com/redpandadata/redpanda","tag":""}
325+
{"repository":"docker.redpanda.com/redpandadata/redpanda","tag":""}
326326
```
327327

328-
### [image.pullPolicy](https://artifacthub.io/packages/helm/redpanda-data/redpanda?modal=values&path=image.pullPolicy)
329-
330-
The imagePullPolicy. If `image.tag` is 'latest', the default is `Always`.
331-
332-
**Default:** `"IfNotPresent"`
333-
334328
### [image.repository](https://artifacthub.io/packages/helm/redpanda-data/redpanda?modal=values&path=image.repository)
335329

336330
Docker repository from which to pull the Redpanda Docker image.

‎charts/redpanda/chart_template_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -319,48 +319,48 @@ func VersionGoldenTestsCases(t *testing.T) []txtar.File {
319319
ErrMsg *string
320320
}{
321321
{
322-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v22.1.0"))},
322+
Image: redpanda.PartialImage{Tag: ptr.To("v22.1.0")},
323323
ErrMsg: ptr.To("no longer supported"),
324324
},
325325
{
326-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v22.2.0"))},
326+
Image: redpanda.PartialImage{Tag: ptr.To("v22.2.0")},
327327
ErrMsg: ptr.To("does not support TLS on the RPC port. Please upgrade. See technical service bulletin 2023-01."),
328328
},
329329
{
330-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v22.3.0"))},
330+
Image: redpanda.PartialImage{Tag: ptr.To("v22.3.0")},
331331
ErrMsg: ptr.To("does not support TLS on the RPC port. Please upgrade. See technical service bulletin 2023-01."),
332332
},
333333
{
334-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v22.3.14"))},
334+
Image: redpanda.PartialImage{Tag: ptr.To("v22.3.14")},
335335
},
336336
{
337-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v22.4.0"))},
337+
Image: redpanda.PartialImage{Tag: ptr.To("v22.4.0")},
338338
ErrMsg: ptr.To("does not support TLS on the RPC port. Please upgrade. See technical service bulletin 2023-01."),
339339
},
340340
{
341-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v23.1.1"))},
341+
Image: redpanda.PartialImage{Tag: ptr.To("v23.1.1")},
342342
ErrMsg: ptr.To("does not support TLS on the RPC port. Please upgrade. See technical service bulletin 2023-01."),
343343
},
344344
{
345-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v23.1.2"))},
345+
Image: redpanda.PartialImage{Tag: ptr.To("v23.1.2")},
346346
},
347347
{
348-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v23.1.3"))},
348+
Image: redpanda.PartialImage{Tag: ptr.To("v23.1.3")},
349349
},
350350
{
351-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v23.2.1"))},
351+
Image: redpanda.PartialImage{Tag: ptr.To("v23.2.1")},
352352
},
353353
{
354-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v23.3.0"))},
354+
Image: redpanda.PartialImage{Tag: ptr.To("v23.3.0")},
355355
},
356356
{
357-
Image: redpanda.PartialImage{Tag: ptr.To(redpanda.ImageTag("v24.1.0"))},
357+
Image: redpanda.PartialImage{Tag: ptr.To("v24.1.0")},
358358
},
359359
{
360-
Image: redpanda.PartialImage{Repository: ptr.To("somecustomrepo"), Tag: ptr.To(redpanda.ImageTag("v24.1.0"))},
360+
Image: redpanda.PartialImage{Repository: ptr.To("somecustomrepo"), Tag: ptr.To("v24.1.0")},
361361
},
362362
{
363-
Image: redpanda.PartialImage{Repository: ptr.To("somecustomrepo"), Tag: ptr.To(redpanda.ImageTag("v23.2.8"))},
363+
Image: redpanda.PartialImage{Repository: ptr.To("somecustomrepo"), Tag: ptr.To("v23.2.8")},
364364
},
365365
}
366366

‎charts/redpanda/chart_test.go‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,6 @@ func mTLSValuesWithProvidedCerts(serverTLSSecretName, clientTLSSecretName string
850850
}
851851

852852
func minimalValues(partials ...*redpanda.PartialValues) *redpanda.PartialValues {
853-
devTag := redpanda.ImageTag("dev")
854853
final := &redpanda.PartialValues{
855854
Console: &console.PartialValues{
856855
Enabled: ptr.To(false),
@@ -861,18 +860,12 @@ func minimalValues(partials ...*redpanda.PartialValues) *redpanda.PartialValues
861860
Spec: applycorev1.PodSpec().WithTerminationGracePeriodSeconds(10),
862861
},
863862
SideCars: &redpanda.PartialSidecars{
864-
Image: &struct {
865-
Tag *redpanda.ImageTag "json:\"tag,omitempty\" jsonschema:\"required,default=Chart.appVersion\""
866-
Repository *string "json:\"repository,omitempty\" jsonschema:\"required,default=docker.redpanda.com/redpandadata/redpanda-operator\""
867-
}{
863+
Image: &redpanda.PartialImage{
868864
Repository: ptr.To("localhost/redpanda-operator"),
869-
Tag: &devTag,
865+
Tag: ptr.To("dev"),
870866
},
871867
Controllers: &struct {
872-
Image *struct {
873-
Tag *redpanda.ImageTag "json:\"tag,omitempty\" jsonschema:\"required,default=Chart.appVersion\""
874-
Repository *string "json:\"repository,omitempty\" jsonschema:\"required,default=docker.redpanda.com/redpandadata/redpanda-operator\""
875-
} "json:\"image,omitempty\""
868+
Image *redpanda.PartialImage "json:\"image,omitempty\""
876869
Enabled *bool "json:\"enabled,omitempty\""
877870
CreateRBAC *bool "json:\"createRBAC,omitempty\""
878871
Resources any "json:\"resources,omitempty\""
@@ -882,12 +875,9 @@ func minimalValues(partials ...*redpanda.PartialValues) *redpanda.PartialValues
882875
PprofAddress *string "json:\"pprofAddress,omitempty\""
883876
Run []string "json:\"run,omitempty\""
884877
}{
885-
Image: &struct {
886-
Tag *redpanda.ImageTag "json:\"tag,omitempty\" jsonschema:\"required,default=Chart.appVersion\""
887-
Repository *string "json:\"repository,omitempty\" jsonschema:\"required,default=docker.redpanda.com/redpandadata/redpanda-operator\""
888-
}{
878+
Image: &redpanda.PartialImage{
889879
Repository: ptr.To("localhost/redpanda-operator"),
890-
Tag: &devTag,
880+
Tag: ptr.To("dev"),
891881
},
892882
},
893883
},

‎charts/redpanda/templates/_values.go.tpl‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@
151151
{{- range $_ := (list 1) -}}
152152
{{- $_is_returning := false -}}
153153
{{- if (and (ne (toJson $rr.limits) "null") (ne (toJson $rr.requests) "null")) -}}
154-
{{- $_451_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.requests) "cpu" "0")))) "r") -}}
155-
{{- $cpuReq := (index $_451_cpuReq_ok 0) -}}
156-
{{- $ok := (index $_451_cpuReq_ok 1) -}}
154+
{{- $_450_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.requests) "cpu" "0")))) "r") -}}
155+
{{- $cpuReq := (index $_450_cpuReq_ok 0) -}}
156+
{{- $ok := (index $_450_cpuReq_ok 1) -}}
157157
{{- if (not $ok) -}}
158-
{{- $_453_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.limits) "cpu" "0")))) "r") -}}
159-
{{- $cpuReq = (index $_453_cpuReq_ok 0) -}}
160-
{{- $ok = (index $_453_cpuReq_ok 1) -}}
158+
{{- $_452_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.limits) "cpu" "0")))) "r") -}}
159+
{{- $cpuReq = (index $_452_cpuReq_ok 0) -}}
160+
{{- $ok = (index $_452_cpuReq_ok 1) -}}
161161
{{- end -}}
162162
{{- if (and $ok (lt ((get (fromJson (include "_shims.resource_MilliValue" (dict "a" (list $cpuReq)))) "r") | int64) (1000 | int64))) -}}
163163
{{- $_is_returning = true -}}
@@ -184,13 +184,13 @@
184184
{{- range $_ := (list 1) -}}
185185
{{- $_is_returning := false -}}
186186
{{- if (and (ne (toJson $rr.limits) "null") (ne (toJson $rr.requests) "null")) -}}
187-
{{- $_477_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.requests) "cpu" "0")))) "r") -}}
188-
{{- $cpuReq := (index $_477_cpuReq_ok 0) -}}
189-
{{- $ok := (index $_477_cpuReq_ok 1) -}}
187+
{{- $_476_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.requests) "cpu" "0")))) "r") -}}
188+
{{- $cpuReq := (index $_476_cpuReq_ok 0) -}}
189+
{{- $ok := (index $_476_cpuReq_ok 1) -}}
190190
{{- if (not $ok) -}}
191-
{{- $_479_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.limits) "cpu" "0")))) "r") -}}
192-
{{- $cpuReq = (index $_479_cpuReq_ok 0) -}}
193-
{{- $ok = (index $_479_cpuReq_ok 1) -}}
191+
{{- $_478_cpuReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.limits) "cpu" "0")))) "r") -}}
192+
{{- $cpuReq = (index $_478_cpuReq_ok 0) -}}
193+
{{- $ok = (index $_478_cpuReq_ok 1) -}}
194194
{{- end -}}
195195
{{- if (not $ok) -}}
196196
{{- $_is_returning = true -}}
@@ -222,13 +222,13 @@
222222
{{- range $_ := (list 1) -}}
223223
{{- $_is_returning := false -}}
224224
{{- if (and (ne (toJson $rr.limits) "null") (ne (toJson $rr.requests) "null")) -}}
225-
{{- $_536_memReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.requests) "memory" "0")))) "r") -}}
226-
{{- $memReq := (index $_536_memReq_ok 0) -}}
227-
{{- $ok := (index $_536_memReq_ok 1) -}}
225+
{{- $_535_memReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.requests) "memory" "0")))) "r") -}}
226+
{{- $memReq := (index $_535_memReq_ok 0) -}}
227+
{{- $ok := (index $_535_memReq_ok 1) -}}
228228
{{- if (not $ok) -}}
229-
{{- $_538_memReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.limits) "memory" "0")))) "r") -}}
230-
{{- $memReq = (index $_538_memReq_ok 0) -}}
231-
{{- $ok = (index $_538_memReq_ok 1) -}}
229+
{{- $_537_memReq_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list ($rr.limits) "memory" "0")))) "r") -}}
230+
{{- $memReq = (index $_537_memReq_ok 0) -}}
231+
{{- $ok = (index $_537_memReq_ok 1) -}}
232232
{{- end -}}
233233
{{- if (not $ok) -}}
234234
{{- $_is_returning = true -}}
@@ -304,9 +304,9 @@
304304
{{- range $_ := (list 1) -}}
305305
{{- $_is_returning := false -}}
306306
{{- $conf := (get (fromJson (include "redpanda.Storage.GetTieredStorageConfig" (dict "a" (list $s)))) "r") -}}
307-
{{- $_656_b_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list $conf "cloud_storage_enabled" (coalesce nil))))) "r") -}}
308-
{{- $b := (index $_656_b_ok 0) -}}
309-
{{- $ok := (index $_656_b_ok 1) -}}
307+
{{- $_655_b_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list $conf "cloud_storage_enabled" (coalesce nil))))) "r") -}}
308+
{{- $b := (index $_655_b_ok 0) -}}
309+
{{- $ok := (index $_655_b_ok 1) -}}
310310
{{- $_is_returning = true -}}
311311
{{- (dict "r" (and $ok (get (fromJson (include "_shims.typeassertion" (dict "a" (list "bool" $b)))) "r"))) | toJson -}}
312312
{{- break -}}
@@ -351,18 +351,18 @@
351351
{{- range $_ := (list 1) -}}
352352
{{- $_is_returning := false -}}
353353
{{- $values := $dot.Values.AsMap -}}
354-
{{- $_685_dir_7_ok_8 := (get (fromJson (include "_shims.typetest" (dict "a" (list "string" (index $values.config.node "cloud_storage_cache_directory") "")))) "r") -}}
355-
{{- $dir_7 := (index $_685_dir_7_ok_8 0) -}}
356-
{{- $ok_8 := (index $_685_dir_7_ok_8 1) -}}
354+
{{- $_684_dir_7_ok_8 := (get (fromJson (include "_shims.typetest" (dict "a" (list "string" (index $values.config.node "cloud_storage_cache_directory") "")))) "r") -}}
355+
{{- $dir_7 := (index $_684_dir_7_ok_8 0) -}}
356+
{{- $ok_8 := (index $_684_dir_7_ok_8 1) -}}
357357
{{- if $ok_8 -}}
358358
{{- $_is_returning = true -}}
359359
{{- (dict "r" $dir_7) | toJson -}}
360360
{{- break -}}
361361
{{- end -}}
362362
{{- $tieredConfig := (get (fromJson (include "redpanda.Storage.GetTieredStorageConfig" (dict "a" (list $values.storage)))) "r") -}}
363-
{{- $_694_dir_9_ok_10 := (get (fromJson (include "_shims.typetest" (dict "a" (list "string" (index $tieredConfig "cloud_storage_cache_directory") "")))) "r") -}}
364-
{{- $dir_9 := (index $_694_dir_9_ok_10 0) -}}
365-
{{- $ok_10 := (index $_694_dir_9_ok_10 1) -}}
363+
{{- $_693_dir_9_ok_10 := (get (fromJson (include "_shims.typetest" (dict "a" (list "string" (index $tieredConfig "cloud_storage_cache_directory") "")))) "r") -}}
364+
{{- $dir_9 := (index $_693_dir_9_ok_10 0) -}}
365+
{{- $ok_10 := (index $_693_dir_9_ok_10 1) -}}
366366
{{- if $ok_10 -}}
367367
{{- $_is_returning = true -}}
368368
{{- (dict "r" $dir_9) | toJson -}}
@@ -462,9 +462,9 @@
462462
{{- $result := (dict) -}}
463463
{{- $s := (toJson $t) -}}
464464
{{- $tune := (fromJson $s) -}}
465-
{{- $_905_m_ok := (get (fromJson (include "_shims.typetest" (dict "a" (list (printf "map[%s]%s" "string" "interface {}") $tune (coalesce nil))))) "r") -}}
466-
{{- $m := (index $_905_m_ok 0) -}}
467-
{{- $ok := (index $_905_m_ok 1) -}}
465+
{{- $_904_m_ok := (get (fromJson (include "_shims.typetest" (dict "a" (list (printf "map[%s]%s" "string" "interface {}") $tune (coalesce nil))))) "r") -}}
466+
{{- $m := (index $_904_m_ok 0) -}}
467+
{{- $ok := (index $_904_m_ok 1) -}}
468468
{{- if (not $ok) -}}
469469
{{- $_is_returning = true -}}
470470
{{- (dict "r" (dict)) | toJson -}}
@@ -620,9 +620,9 @@
620620
{{- $seen := (dict) -}}
621621
{{- $deduped := (coalesce nil) -}}
622622
{{- range $_, $item := $items -}}
623-
{{- $_1069___ok_11 := (get (fromJson (include "_shims.dicttest" (dict "a" (list $seen $item.key false)))) "r") -}}
624-
{{- $_ := (index $_1069___ok_11 0) -}}
625-
{{- $ok_11 := (index $_1069___ok_11 1) -}}
623+
{{- $_1062___ok_11 := (get (fromJson (include "_shims.dicttest" (dict "a" (list $seen $item.key false)))) "r") -}}
624+
{{- $_ := (index $_1062___ok_11 0) -}}
625+
{{- $ok_11 := (index $_1062___ok_11 1) -}}
626626
{{- if $ok_11 -}}
627627
{{- continue -}}
628628
{{- end -}}
@@ -734,9 +734,9 @@
734734
{{- $name := (index .a 1) -}}
735735
{{- range $_ := (list 1) -}}
736736
{{- $_is_returning := false -}}
737-
{{- $_1290_cert_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list $m $name (dict "enabled" (coalesce nil) "caEnabled" false "applyInternalDNSNames" (coalesce nil) "duration" "" "issuerRef" (coalesce nil) "secretRef" (coalesce nil) "clientSecretRef" (coalesce nil)))))) "r") -}}
738-
{{- $cert := (index $_1290_cert_ok 0) -}}
739-
{{- $ok := (index $_1290_cert_ok 1) -}}
737+
{{- $_1283_cert_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list $m $name (dict "enabled" (coalesce nil) "caEnabled" false "applyInternalDNSNames" (coalesce nil) "duration" "" "issuerRef" (coalesce nil) "secretRef" (coalesce nil) "clientSecretRef" (coalesce nil)))))) "r") -}}
738+
{{- $cert := (index $_1283_cert_ok 0) -}}
739+
{{- $ok := (index $_1283_cert_ok 1) -}}
740740
{{- if (not $ok) -}}
741741
{{- $_ := (fail (printf "Certificate %q referenced, but not found in the tls.certs map" $name)) -}}
742742
{{- end -}}
@@ -1482,9 +1482,9 @@
14821482
{{- $result := (dict) -}}
14831483
{{- range $k, $v := $c -}}
14841484
{{- if (not (empty $v)) -}}
1485-
{{- $_2126___ok_18 := (get (fromJson (include "_shims.asnumeric" (dict "a" (list $v)))) "r") -}}
1486-
{{- $_ := ((index $_2126___ok_18 0) | float64) -}}
1487-
{{- $ok_18 := (index $_2126___ok_18 1) -}}
1485+
{{- $_2119___ok_18 := (get (fromJson (include "_shims.asnumeric" (dict "a" (list $v)))) "r") -}}
1486+
{{- $_ := ((index $_2119___ok_18 0) | float64) -}}
1487+
{{- $ok_18 := (index $_2119___ok_18 1) -}}
14881488
{{- if $ok_18 -}}
14891489
{{- $_ := (set $result $k $v) -}}
14901490
{{- else -}}{{- if (kindIs "bool" $v) -}}
@@ -1510,9 +1510,9 @@
15101510
{{- $_is_returning := false -}}
15111511
{{- $result := (dict) -}}
15121512
{{- range $k, $v := $c -}}
1513-
{{- $_2146_b_19_ok_20 := (get (fromJson (include "_shims.typetest" (dict "a" (list "bool" $v false)))) "r") -}}
1514-
{{- $b_19 := (index $_2146_b_19_ok_20 0) -}}
1515-
{{- $ok_20 := (index $_2146_b_19_ok_20 1) -}}
1513+
{{- $_2139_b_19_ok_20 := (get (fromJson (include "_shims.typetest" (dict "a" (list "bool" $v false)))) "r") -}}
1514+
{{- $b_19 := (index $_2139_b_19_ok_20 0) -}}
1515+
{{- $ok_20 := (index $_2139_b_19_ok_20 1) -}}
15161516
{{- if $ok_20 -}}
15171517
{{- $_ := (set $result $k $b_19) -}}
15181518
{{- continue -}}
@@ -1555,15 +1555,15 @@
15551555
{{- $config := (index .a 1) -}}
15561556
{{- range $_ := (list 1) -}}
15571557
{{- $_is_returning := false -}}
1558-
{{- $_2191___hasAccessKey := (get (fromJson (include "_shims.dicttest" (dict "a" (list $config "cloud_storage_access_key" (coalesce nil))))) "r") -}}
1559-
{{- $_ := (index $_2191___hasAccessKey 0) -}}
1560-
{{- $hasAccessKey := (index $_2191___hasAccessKey 1) -}}
1561-
{{- $_2192___hasSecretKey := (get (fromJson (include "_shims.dicttest" (dict "a" (list $config "cloud_storage_secret_key" (coalesce nil))))) "r") -}}
1562-
{{- $_ := (index $_2192___hasSecretKey 0) -}}
1563-
{{- $hasSecretKey := (index $_2192___hasSecretKey 1) -}}
1564-
{{- $_2193___hasSharedKey := (get (fromJson (include "_shims.dicttest" (dict "a" (list $config "cloud_storage_azure_shared_key" (coalesce nil))))) "r") -}}
1565-
{{- $_ := (index $_2193___hasSharedKey 0) -}}
1566-
{{- $hasSharedKey := (index $_2193___hasSharedKey 1) -}}
1558+
{{- $_2184___hasAccessKey := (get (fromJson (include "_shims.dicttest" (dict "a" (list $config "cloud_storage_access_key" (coalesce nil))))) "r") -}}
1559+
{{- $_ := (index $_2184___hasAccessKey 0) -}}
1560+
{{- $hasAccessKey := (index $_2184___hasAccessKey 1) -}}
1561+
{{- $_2185___hasSecretKey := (get (fromJson (include "_shims.dicttest" (dict "a" (list $config "cloud_storage_secret_key" (coalesce nil))))) "r") -}}
1562+
{{- $_ := (index $_2185___hasSecretKey 0) -}}
1563+
{{- $hasSecretKey := (index $_2185___hasSecretKey 1) -}}
1564+
{{- $_2186___hasSharedKey := (get (fromJson (include "_shims.dicttest" (dict "a" (list $config "cloud_storage_azure_shared_key" (coalesce nil))))) "r") -}}
1565+
{{- $_ := (index $_2186___hasSharedKey 0) -}}
1566+
{{- $hasSharedKey := (index $_2186___hasSharedKey 1) -}}
15671567
{{- $envvars := (coalesce nil) -}}
15681568
{{- if (and (not $hasAccessKey) (get (fromJson (include "redpanda.SecretRef.IsValid" (dict "a" (list $tsc.accessKey)))) "r")) -}}
15691569
{{- $envvars = (concat (default (list) $envvars) (list (mustMergeOverwrite (dict "name" "") (dict "name" "REDPANDA_CLOUD_STORAGE_ACCESS_KEY" "valueFrom" (get (fromJson (include "redpanda.SecretRef.AsSource" (dict "a" (list $tsc.accessKey)))) "r"))))) -}}
@@ -1586,12 +1586,12 @@
15861586
{{- $c := (index .a 0) -}}
15871587
{{- range $_ := (list 1) -}}
15881588
{{- $_is_returning := false -}}
1589-
{{- $_2229___containerExists := (get (fromJson (include "_shims.dicttest" (dict "a" (list $c "cloud_storage_azure_container" (coalesce nil))))) "r") -}}
1590-
{{- $_ := (index $_2229___containerExists 0) -}}
1591-
{{- $containerExists := (index $_2229___containerExists 1) -}}
1592-
{{- $_2230___accountExists := (get (fromJson (include "_shims.dicttest" (dict "a" (list $c "cloud_storage_azure_storage_account" (coalesce nil))))) "r") -}}
1593-
{{- $_ := (index $_2230___accountExists 0) -}}
1594-
{{- $accountExists := (index $_2230___accountExists 1) -}}
1589+
{{- $_2222___containerExists := (get (fromJson (include "_shims.dicttest" (dict "a" (list $c "cloud_storage_azure_container" (coalesce nil))))) "r") -}}
1590+
{{- $_ := (index $_2222___containerExists 0) -}}
1591+
{{- $containerExists := (index $_2222___containerExists 1) -}}
1592+
{{- $_2223___accountExists := (get (fromJson (include "_shims.dicttest" (dict "a" (list $c "cloud_storage_azure_storage_account" (coalesce nil))))) "r") -}}
1593+
{{- $_ := (index $_2223___accountExists 0) -}}
1594+
{{- $accountExists := (index $_2223___accountExists 1) -}}
15951595
{{- $_is_returning = true -}}
15961596
{{- (dict "r" (and $containerExists $accountExists)) | toJson -}}
15971597
{{- break -}}
@@ -1602,9 +1602,9 @@
16021602
{{- $c := (index .a 0) -}}
16031603
{{- range $_ := (list 1) -}}
16041604
{{- $_is_returning := false -}}
1605-
{{- $_2235_value_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list $c `cloud_storage_cache_size` (coalesce nil))))) "r") -}}
1606-
{{- $value := (index $_2235_value_ok 0) -}}
1607-
{{- $ok := (index $_2235_value_ok 1) -}}
1605+
{{- $_2228_value_ok := (get (fromJson (include "_shims.dicttest" (dict "a" (list $c `cloud_storage_cache_size` (coalesce nil))))) "r") -}}
1606+
{{- $value := (index $_2228_value_ok 0) -}}
1607+
{{- $ok := (index $_2228_value_ok 1) -}}
16081608
{{- if (not $ok) -}}
16091609
{{- $_is_returning = true -}}
16101610
{{- (dict "r" (coalesce nil)) | toJson -}}

0 commit comments

Comments
 (0)