Skip to content

Commit 0ccf73a

Browse files
committed
*: prevent circular imports
Prior to this commit there was a circular import in our mod graph. The redpanda chart imported the operator for access to cluster config types and the operator imported the redpanda chart. It appears that go's resolution module uses two different versions of a module to avoid the cycle while performing dependency resolution. The makes it difficult to impossible to resolve dependency conflicts as the historical module is uncontrollable[^1]. This commit severs the charts/redpanda <-> operator cycle by moving the secrets and clusterconfiguration package into pkg. It also enforces the usage of replaces for local modules and a tree dependency structure via a linter. [^1]: This is based on brute force and observation. I could be incorrect about this behavior and simply not know the correct incantation to correct issues.
1 parent 2f90055 commit 0ccf73a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+777
-242
lines changed

charts/console/go.mod

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,17 @@ require (
4040
github.com/containerd/platforms v0.2.1 // indirect
4141
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
4242
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
43-
github.com/docker/docker v27.5.1+incompatible // indirect
4443
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4544
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
4645
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4746
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
4847
github.com/fatih/color v1.18.0 // indirect
49-
github.com/fsnotify/fsnotify v1.9.0 // indirect
5048
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
5149
github.com/getsentry/sentry-go v0.27.0 // indirect
5250
github.com/go-errors/errors v1.5.1 // indirect
5351
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
5452
github.com/go-logr/logr v1.4.2 // indirect
53+
github.com/go-logr/stdr v1.2.2 // indirect
5554
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5655
github.com/go-openapi/jsonreference v0.21.0 // indirect
5756
github.com/go-openapi/swag v0.23.1 // indirect
@@ -114,9 +113,6 @@ require (
114113
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
115114
github.com/pkg/errors v0.9.1 // indirect
116115
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
117-
github.com/prometheus/client_model v0.6.2 // indirect
118-
github.com/prometheus/common v0.64.0 // indirect
119-
github.com/prometheus/procfs v0.16.1 // indirect
120116
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
121117
github.com/rivo/uniseg v0.4.7 // indirect
122118
github.com/rogpeppe/go-internal v1.13.1 // indirect
@@ -130,24 +126,16 @@ require (
130126
github.com/spf13/cobra v1.9.1 // indirect
131127
github.com/spf13/pflag v1.0.7 // indirect
132128
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
133-
github.com/tklauser/numcpus v0.9.0 // indirect
134129
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
135130
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
136131
github.com/x448/float16 v0.8.4 // indirect
137132
github.com/xlab/treeprint v1.2.0 // indirect
138-
go.opentelemetry.io/contrib/bridges/prometheus v0.61.0 // indirect
139-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
133+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
140134
go.opentelemetry.io/otel v1.36.0 // indirect
141-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.11.0 // indirect
142-
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.11.0 // indirect
143-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 // indirect
144-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0 // indirect
145-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
146-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
135+
go.opentelemetry.io/otel/log v0.11.0 // indirect
147136
go.opentelemetry.io/otel/metric v1.36.0 // indirect
148137
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
149138
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
150-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
151139
go.opentelemetry.io/otel/trace v1.36.0 // indirect
152140
go.yaml.in/yaml/v2 v2.4.2 // indirect
153141
go.yaml.in/yaml/v3 v3.0.3 // indirect
@@ -183,3 +171,5 @@ require (
183171
sigs.k8s.io/randfill v1.0.0 // indirect
184172
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
185173
)
174+
175+
replace github.com/redpanda-data/redpanda-operator/pkg => ../../pkg

charts/console/go.sum

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
4040
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
4141
github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
4242
github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
43+
github.com/cert-manager/cert-manager v1.14.5 h1:uuM1O2g2S80nxiH3eW2cZYMGiL2zmDFVdAzg8sibWuc=
44+
github.com/cert-manager/cert-manager v1.14.5/go.mod h1:fmr/cU5jiLxWj69CroDggSOa49RljUK+dU583TaQUXM=
4345
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
4446
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
4547
github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk=
@@ -118,6 +120,7 @@ github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8b
118120
github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
119121
github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
120122
github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw=
123+
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
121124
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
122125
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
123126
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
@@ -317,6 +320,8 @@ github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b h1:0LFwY6Q3g
317320
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
318321
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
319322
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
323+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2 h1:BpGDC87A2SaxbKgONsFLEX3kRcRJee2aLQbjXsuz0hA=
324+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2/go.mod h1:Rd8YnCqz+2FYsiGmE2DMlaLjQRB4v2jFNnzCt9YY4IM=
320325
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
321326
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
322327
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -335,8 +340,6 @@ github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0
335340
github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
336341
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250321104408-a6c0672707ab h1:aa1fDNQ2IqVM7Y45RgoJUABwfvVa4pgVIAu51tD7nOo=
337342
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250321104408-a6c0672707ab/go.mod h1:QkZMtADhtFgS5Bixk6N931yazp9mBtQ7VAJ5gWPrsgg=
338-
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250124085449-058118a82f50 h1:rmgno9TNZCX2c81zJGrv2CZjiPURWevNeQ7Lo8fVszk=
339-
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250124085449-058118a82f50/go.mod h1:b/GBKIBr3nLE+LAtb8P4b2KrOwL3SGXAF4l65UcF71c=
340343
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
341344
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
342345
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -506,7 +509,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
506509
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
507510
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
508511
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
509-
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
512+
google.golang.org/genproto v0.0.0-20250409194420-de1ac958c67a h1:AoyioNVZR+nS6zbvnvW5rjQdeQu7/BWwIT7YI8Gq5wU=
510513
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 h1:Kog3KlB4xevJlAcbbbzPfRG0+X9fdoGM+UBRKVz6Wr0=
511514
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237/go.mod h1:ezi0AVyMKDWy5xAncvjLWH7UcLBB5n7y2fQ8MzjJcto=
512515
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 h1:cJfm9zPbe1e873mHJzmQ1nwVEeRDU/T1wXDK2kUSU34=
@@ -561,6 +564,8 @@ pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
561564
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
562565
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
563566
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
567+
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
568+
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
564569
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
565570
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
566571
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=

charts/redpanda/configmap.tpl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"k8s.io/utils/ptr"
1919

2020
"github.com/redpanda-data/redpanda-operator/gotohelm/helmette"
21-
"github.com/redpanda-data/redpanda-operator/operator/pkg/clusterconfiguration"
21+
"github.com/redpanda-data/redpanda-operator/pkg/clusterconfiguration"
2222
)
2323

2424
func ConfigMaps(state *RenderState) []*corev1.ConfigMap {

charts/redpanda/go.mod

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
github.com/redpanda-data/common-go/rpadmin v0.1.14
1414
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.1.0
1515
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250327164623-c3883a149a17
16-
github.com/redpanda-data/redpanda-operator/operator v0.0.0-20250528175436-e8cca0053dc6
1716
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250528175436-e8cca0053dc6
1817
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6
1918
github.com/stretchr/testify v1.10.0
@@ -45,7 +44,6 @@ require (
4544
cloud.google.com/go/iam v1.5.0 // indirect
4645
cloud.google.com/go/secretmanager v1.14.6 // indirect
4746
dario.cat/mergo v1.0.1 // indirect
48-
emperror.dev/errors v0.8.1 // indirect
4947
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
5048
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.1 // indirect
5149
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
@@ -77,12 +75,9 @@ require (
7775
github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
7876
github.com/aws/smithy-go v1.22.0 // indirect
7977
github.com/bahlo/generic-list-go v0.2.0 // indirect
80-
github.com/beorn7/perks v1.0.1 // indirect
8178
github.com/blang/semver/v4 v4.0.0 // indirect
8279
github.com/buger/jsonparser v1.1.1 // indirect
83-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8480
github.com/chai2010/gettext-go v1.0.2 // indirect
85-
github.com/cisco-open/k8s-objectmatcher v1.9.0 // indirect
8681
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
8782
github.com/cockroachdb/redact v1.1.5 // indirect
8883
github.com/containerd/containerd v1.7.27 // indirect
@@ -97,7 +92,6 @@ require (
9792
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
9893
github.com/fatih/color v1.18.0 // indirect
9994
github.com/felixge/httpsnoop v1.0.4 // indirect
100-
github.com/fsnotify/fsnotify v1.9.0 // indirect
10195
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
10296
github.com/getsentry/sentry-go v0.27.0 // indirect
10397
github.com/go-errors/errors v1.5.1 // indirect
@@ -172,10 +166,6 @@ require (
172166
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
173167
github.com/pkg/errors v0.9.1 // indirect
174168
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
175-
github.com/prometheus/client_golang v1.22.0 // indirect
176-
github.com/prometheus/client_model v0.6.2 // indirect
177-
github.com/prometheus/common v0.64.0 // indirect
178-
github.com/prometheus/procfs v0.16.1 // indirect
179169
github.com/redpanda-data/common-go/net v0.1.0 // indirect
180170
github.com/redpanda-data/common-go/secrets v0.1.3 // indirect
181171
github.com/rivo/uniseg v0.4.7 // indirect
@@ -207,7 +197,10 @@ require (
207197
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
208198
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
209199
go.opentelemetry.io/otel v1.36.0 // indirect
200+
go.opentelemetry.io/otel/log v0.11.0 // indirect
210201
go.opentelemetry.io/otel/metric v1.36.0 // indirect
202+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
203+
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
211204
go.opentelemetry.io/otel/trace v1.36.0 // indirect
212205
go.uber.org/multierr v1.11.0 // indirect
213206
go.yaml.in/yaml/v2 v2.4.2 // indirect
@@ -220,7 +213,6 @@ require (
220213
golang.org/x/term v0.33.0 // indirect
221214
golang.org/x/text v0.27.0 // indirect
222215
golang.org/x/time v0.11.0 // indirect
223-
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
224216
google.golang.org/api v0.227.0 // indirect
225217
google.golang.org/genproto v0.0.0-20250409194420-de1ac958c67a // indirect
226218
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
@@ -250,5 +242,6 @@ require (
250242

251243
replace (
252244
github.com/redpanda-data/redpanda-operator/charts/console/v3 => ../../charts/console
245+
github.com/redpanda-data/redpanda-operator/pkg => ../../pkg
253246
pgregory.net/rapid => github.com/chrisseto/rapid v0.0.0-20240815210052-cdeef406c65c
254247
)

charts/redpanda/go.sum

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ cloud.google.com/go/secretmanager v1.14.6 h1:/ooktIMSORaWk9gm3vf8+Mg+zSrUplJFKBz
2222
cloud.google.com/go/secretmanager v1.14.6/go.mod h1:0OWeM3qpJ2n71MGgNfKsgjC/9LfVTcUqXFUlGxo5PzY=
2323
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
2424
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
25-
emperror.dev/errors v0.8.1 h1:UavXZ5cSX/4u9iyvH6aDcuGkVjeexUGJ7Ij7G4VfQT0=
26-
emperror.dev/errors v0.8.1/go.mod h1:YcRvLPh626Ubn2xqtoprejnA5nFha+TJ+2vew48kWuE=
2725
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
2826
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
2927
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
@@ -122,8 +120,6 @@ github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNS
122120
github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA=
123121
github.com/chrisseto/rapid v0.0.0-20240815210052-cdeef406c65c h1:GZtcJAFTBCr16eM7ytFwWMg9oLaMsRfSsVyi3lTo+mw=
124122
github.com/chrisseto/rapid v0.0.0-20240815210052-cdeef406c65c/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
125-
github.com/cisco-open/k8s-objectmatcher v1.9.0 h1:/sfuO0BD09fpynZjXsqeZrh28Juc4VEwc2P6Ov/Q6fM=
126-
github.com/cisco-open/k8s-objectmatcher v1.9.0/go.mod h1:CH4E6qAK+q+JwKFJn0DaTNqxrbmWCaDQzGthKLK4nZ0=
127123
github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=
128124
github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8=
129125
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
@@ -452,10 +448,6 @@ github.com/redpanda-data/common-go/secrets v0.1.3 h1:VRo+OFS4Zgb2UMvwcIuUujdMhAP
452448
github.com/redpanda-data/common-go/secrets v0.1.3/go.mod h1:WjUU/5saSXwItZx6veFOGbQZUgPQz4MQ65z22y0Ky84=
453449
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250327164623-c3883a149a17 h1:aARsVhc9XYhrC/aeJpDHnel8QicHbo6BtZzbhqe33UY=
454450
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250327164623-c3883a149a17/go.mod h1:QkZMtADhtFgS5Bixk6N931yazp9mBtQ7VAJ5gWPrsgg=
455-
github.com/redpanda-data/redpanda-operator/operator v0.0.0-20250528175436-e8cca0053dc6 h1:7ZGF97PVyQ5yst9mvcmnllYCfMgRSts/1XYgh84Q6Pw=
456-
github.com/redpanda-data/redpanda-operator/operator v0.0.0-20250528175436-e8cca0053dc6/go.mod h1:C4oYf3EfNvIhrNnRqciGojBoeiBm06hO8QrquzYJFG4=
457-
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250528175436-e8cca0053dc6 h1:3j3DgUcLJIDXnQYv+bOt2GShkTq0LZlFzFypSaZFUMc=
458-
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250528175436-e8cca0053dc6/go.mod h1:YWnwTs6NZCiNQNTkQkJCC7Fdwbn5ur8hIcloWjuR+48=
459451
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6 h1:SbcvWTYFEbH5+NQOl1To5jppEa8RCK1HAkRNfhdUGLg=
460452
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6/go.mod h1:/8XZuwUVFOGUkn31kglW28Xie5TrM7COtzRMA3GixaA=
461453
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -598,10 +590,8 @@ go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKr
598590
go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
599591
go.opentelemetry.io/proto/otlp v1.6.0 h1:jQjP+AQyTf+Fe7OKj/MfkDrmK4MNVtw2NpXsf9fefDI=
600592
go.opentelemetry.io/proto/otlp v1.6.0/go.mod h1:cicgGehlFuNdgZkcALOCh3VE6K/u2tAjzlRhDwmVpZc=
601-
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
602593
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
603594
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
604-
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
605595
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
606596
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
607597
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=

charts/redpanda/values.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
consolechart "github.com/redpanda-data/redpanda-operator/charts/console/v3/chart"
3131
"github.com/redpanda-data/redpanda-operator/gotohelm/helmette"
32-
"github.com/redpanda-data/redpanda-operator/operator/pkg/clusterconfiguration"
32+
"github.com/redpanda-data/redpanda-operator/pkg/clusterconfiguration"
3333
)
3434

3535
const (

charts/redpanda/values_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"k8s.io/apimachinery/pkg/api/resource"
2121
"k8s.io/utils/ptr"
2222

23-
"github.com/redpanda-data/redpanda-operator/operator/pkg/clusterconfiguration"
23+
"github.com/redpanda-data/redpanda-operator/pkg/clusterconfiguration"
2424
)
2525

2626
func TestListeners_TrustStoreVolumes(t *testing.T) {

gen/go.mod

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ require (
4343
cloud.google.com/go/iam v1.5.0 // indirect
4444
cloud.google.com/go/secretmanager v1.14.6 // indirect
4545
dario.cat/mergo v1.0.1 // indirect
46-
emperror.dev/errors v0.8.1 // indirect
4746
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
4847
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.1 // indirect
4948
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
@@ -75,14 +74,11 @@ require (
7574
github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
7675
github.com/aws/smithy-go v1.22.0 // indirect
7776
github.com/bahlo/generic-list-go v0.2.0 // indirect
78-
github.com/beorn7/perks v1.0.1 // indirect
7977
github.com/blang/semver/v4 v4.0.0 // indirect
8078
github.com/buger/jsonparser v1.1.1 // indirect
8179
github.com/buildkite/interpolate v0.1.5 // indirect
8280
github.com/cert-manager/cert-manager v1.14.5 // indirect
83-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8481
github.com/chai2010/gettext-go v1.0.2 // indirect
85-
github.com/cisco-open/k8s-objectmatcher v1.9.0 // indirect
8682
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
8783
github.com/cockroachdb/redact v1.1.5 // indirect
8884
github.com/containerd/containerd v1.7.27 // indirect
@@ -97,7 +93,6 @@ require (
9793
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
9894
github.com/fatih/color v1.18.0 // indirect
9995
github.com/felixge/httpsnoop v1.0.4 // indirect
100-
github.com/fsnotify/fsnotify v1.9.0 // indirect
10196
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
10297
github.com/getsentry/sentry-go v0.27.0 // indirect
10398
github.com/go-errors/errors v1.5.1 // indirect
@@ -175,10 +170,6 @@ require (
175170
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
176171
github.com/pkg/errors v0.9.1 // indirect
177172
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
178-
github.com/prometheus/client_golang v1.22.0 // indirect
179-
github.com/prometheus/client_model v0.6.2 // indirect
180-
github.com/prometheus/common v0.64.0 // indirect
181-
github.com/prometheus/procfs v0.16.1 // indirect
182173
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
183174
github.com/redpanda-data/common-go/net v0.1.0 // indirect
184175
github.com/redpanda-data/common-go/rpadmin v0.1.14 // indirect
@@ -233,7 +224,6 @@ require (
233224
golang.org/x/sys v0.34.0 // indirect
234225
golang.org/x/term v0.33.0 // indirect
235226
golang.org/x/time v0.11.0 // indirect
236-
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
237227
google.golang.org/api v0.227.0 // indirect
238228
google.golang.org/genproto v0.0.0-20250409194420-de1ac958c67a // indirect
239229
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect

0 commit comments

Comments
 (0)