Skip to content

Commit 9c1ec4d

Browse files
sago2k8sago2k8
authored
chore(operator): update indirect dependency common-go/secrets to v0.1.4 (#1149)
update indirect dependency github.com/redpanda-data/common-go/secrets from v0.1.3 to v0.1.4 in the following modules: - acceptance - charts/redpanda - gen - operator update pkg/secrets: pass empty string as 4th argument to NewGCPSecretExpander Signed-off-by: santiago <[email protected]>
1 parent f348d28 commit 9c1ec4d

File tree

17 files changed

+26
-807
lines changed

17 files changed

+26
-807
lines changed

‎acceptance/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ require (
200200
github.com/prometheus/procfs v0.17.0 // indirect
201201
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
202202
github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7 // indirect
203-
github.com/redpanda-data/common-go/secrets v0.1.3 // indirect
203+
github.com/redpanda-data/common-go/secrets v0.1.4 // indirect
204204
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b // indirect
205205
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.2.0 // indirect
206206
github.com/redpanda-data/redpanda-operator/charts/redpanda/v25 v25.0.0 // indirect

‎acceptance/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,8 @@ github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7 h1:M
549549
github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7/go.mod h1:UJIi/yUxGOBYXUrfUsOkxfYxcb/ll7mZrwae/i+U2kc=
550550
github.com/redpanda-data/common-go/rpadmin v0.1.17-0.20250918052456-493894730cb7 h1:RGdPbgiCplZvFQ40r7n0SlEP9R4w5kCGrADOV+W7/7o=
551551
github.com/redpanda-data/common-go/rpadmin v0.1.17-0.20250918052456-493894730cb7/go.mod h1:NMOb9iySu0qkqREwoZaN0WANeqaGEZKDtKMecSobToQ=
552-
github.com/redpanda-data/common-go/secrets v0.1.3 h1:VRo+OFS4Zgb2UMvwcIuUujdMhAPNGoGESZgcF4gjgcY=
553-
github.com/redpanda-data/common-go/secrets v0.1.3/go.mod h1:WjUU/5saSXwItZx6veFOGbQZUgPQz4MQ65z22y0Ky84=
552+
github.com/redpanda-data/common-go/secrets v0.1.4 h1:CGp3KolGnjcJvIafTwf7Hlj5ztLOJCjgkegRu7IAkSw=
553+
github.com/redpanda-data/common-go/secrets v0.1.4/go.mod h1:WjUU/5saSXwItZx6veFOGbQZUgPQz4MQ65z22y0Ky84=
554554
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b h1:zwQznaAIBpxCL9FDaILJT+L7b3YGAD6QxK21hFzhEls=
555555
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b/go.mod h1:dWaJBv8Eqpe21aREHEPlacC6bNoxWArvlcgWEB6t+3w=
556556
github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250718150737-e01f8476d560 h1:fhMikrIYgjTukRTS7zZHJ5sFQP4hotkfExEyFRWw6rI=

‎charts/redpanda/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ require (
179179
github.com/pkg/errors v0.9.1 // indirect
180180
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
181181
github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7 // indirect
182-
github.com/redpanda-data/common-go/secrets v0.1.3 // indirect
182+
github.com/redpanda-data/common-go/secrets v0.1.4 // indirect
183183
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b // indirect
184184
github.com/rivo/uniseg v0.4.7 // indirect
185185
github.com/rogpeppe/go-internal v1.14.1 // indirect

‎charts/redpanda/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7 h1:M
472472
github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7/go.mod h1:UJIi/yUxGOBYXUrfUsOkxfYxcb/ll7mZrwae/i+U2kc=
473473
github.com/redpanda-data/common-go/rpadmin v0.1.17-0.20250918052456-493894730cb7 h1:RGdPbgiCplZvFQ40r7n0SlEP9R4w5kCGrADOV+W7/7o=
474474
github.com/redpanda-data/common-go/rpadmin v0.1.17-0.20250918052456-493894730cb7/go.mod h1:NMOb9iySu0qkqREwoZaN0WANeqaGEZKDtKMecSobToQ=
475-
github.com/redpanda-data/common-go/secrets v0.1.3 h1:VRo+OFS4Zgb2UMvwcIuUujdMhAPNGoGESZgcF4gjgcY=
476-
github.com/redpanda-data/common-go/secrets v0.1.3/go.mod h1:WjUU/5saSXwItZx6veFOGbQZUgPQz4MQ65z22y0Ky84=
475+
github.com/redpanda-data/common-go/secrets v0.1.4 h1:CGp3KolGnjcJvIafTwf7Hlj5ztLOJCjgkegRu7IAkSw=
476+
github.com/redpanda-data/common-go/secrets v0.1.4/go.mod h1:WjUU/5saSXwItZx6veFOGbQZUgPQz4MQ65z22y0Ky84=
477477
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b h1:zwQznaAIBpxCL9FDaILJT+L7b3YGAD6QxK21hFzhEls=
478478
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b/go.mod h1:dWaJBv8Eqpe21aREHEPlacC6bNoxWArvlcgWEB6t+3w=
479479
github.com/redpanda-data/redpanda-operator/gotohelm v1.2.1-0.20250909192010-c59ff494d04a h1:cBI+h6YFt1y45nvGQ4oFOEhPcQa/ih3DiNFJpFm5XVE=

‎gen/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ require (
185185
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
186186
github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7 // indirect
187187
github.com/redpanda-data/common-go/rpadmin v0.1.17-0.20250918052456-493894730cb7 // indirect
188-
github.com/redpanda-data/common-go/secrets v0.1.3 // indirect
188+
github.com/redpanda-data/common-go/secrets v0.1.4 // indirect
189189
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b // indirect
190190
github.com/redpanda-data/redpanda-operator/gotohelm v1.2.1-0.20250909192010-c59ff494d04a // indirect
191191
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6 // indirect

‎gen/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7 h1:M
524524
github.com/redpanda-data/common-go/net v0.1.1-0.20240429123545-4da3d2b371f7/go.mod h1:UJIi/yUxGOBYXUrfUsOkxfYxcb/ll7mZrwae/i+U2kc=
525525
github.com/redpanda-data/common-go/rpadmin v0.1.17-0.20250918052456-493894730cb7 h1:RGdPbgiCplZvFQ40r7n0SlEP9R4w5kCGrADOV+W7/7o=
526526
github.com/redpanda-data/common-go/rpadmin v0.1.17-0.20250918052456-493894730cb7/go.mod h1:NMOb9iySu0qkqREwoZaN0WANeqaGEZKDtKMecSobToQ=
527-
github.com/redpanda-data/common-go/secrets v0.1.3 h1:VRo+OFS4Zgb2UMvwcIuUujdMhAPNGoGESZgcF4gjgcY=
528-
github.com/redpanda-data/common-go/secrets v0.1.3/go.mod h1:WjUU/5saSXwItZx6veFOGbQZUgPQz4MQ65z22y0Ky84=
527+
github.com/redpanda-data/common-go/secrets v0.1.4 h1:CGp3KolGnjcJvIafTwf7Hlj5ztLOJCjgkegRu7IAkSw=
528+
github.com/redpanda-data/common-go/secrets v0.1.4/go.mod h1:WjUU/5saSXwItZx6veFOGbQZUgPQz4MQ65z22y0Ky84=
529529
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b h1:zwQznaAIBpxCL9FDaILJT+L7b3YGAD6QxK21hFzhEls=
530530
github.com/redpanda-data/console/backend v0.0.0-20250915195818-3cd9fabec94b/go.mod h1:dWaJBv8Eqpe21aREHEPlacC6bNoxWArvlcgWEB6t+3w=
531531
github.com/redpanda-data/redpanda-operator/gotohelm v1.2.1-0.20250909192010-c59ff494d04a h1:cBI+h6YFt1y45nvGQ4oFOEhPcQa/ih3DiNFJpFm5XVE=

‎gotohelm/helmette/sprig.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,6 @@ func Keys[K comparable, V any](m map[K]V) []K {
166166
}
167167

168168
// Merge is a go equivalent of sprig's `merge`.
169-
//
170-
// It merges two or more maps into one, giving precedence from left
171-
// to right.
172-
//
173-
// Unlink sprig, a modified map is returned rather than modifying the left most
174-
// map.
175-
//
176-
// Merge(map[int]int{1:1,2:2},map[int]int{1:2,2:3,3:4}) // map[int]int{1:1,2:2,3:4}
177169
func Merge[K comparable, V any](sources ...map[K]V) map[K]V {
178170
dst := map[K]V{}
179171
for _, src := range sources {

‎operator/chart/chart_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ func TestTemplate(t *testing.T) {
396396
goldens := testutil.NewTxTar(t, "testdata/template-cases.golden.txtar")
397397

398398
for _, tc := range append(casesArchive.Files, generatedCasesArchive.Files...) {
399+
tc := tc
399400
t.Run(tc.Name, func(t *testing.T) {
400401
t.Parallel()
401402

‎operator/chart/deployment.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func operatorArguments(dot *helmette.Dot) []string {
335335
userProvided := chartutil.ParseFlags(values.AdditionalCmdFlags)
336336

337337
var flags []string
338-
for key, value := range helmette.SortedMap(helmette.Merge(userProvided, defaults)) {
338+
for key, value := range helmette.SortedMap(helmette.Merge(defaults, userProvided)) {
339339
if value == "" {
340340
flags = append(flags, key)
341341
} else {

‎operator/chart/templates/_deployment.go.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
{{- end -}}
156156
{{- $userProvided := (get (fromJson (include "chartutil.ParseFlags" (dict "a" (list $values.additionalCmdFlags)))) "r") -}}
157157
{{- $flags := (coalesce nil) -}}
158-
{{- range $key, $value := (merge (dict) $userProvided $defaults) -}}
158+
{{- range $key, $value := (merge (dict) $defaults $userProvided) -}}
159159
{{- if (eq $value "") -}}
160160
{{- $flags = (concat (default (list) $flags) (list $key)) -}}
161161
{{- else -}}

0 commit comments

Comments
 (0)