Skip to content

Commit a1b36ea

Browse files
andrewstuckichrisseto
andrewstucki
and
chrisseto
authored
Replace redpanda pinned version with local code in the operator repo. (#627)
* Replace redpanda pinned version with local code in the operator repo. * Fix up tests * Remove no longer valid test * Fix up imports and repoint to v25 of redpanda chart * regen golden files * Fix failing tests --------- Co-authored-by: Chris Seto <chriskseto@gmail.com>
1 parent 81003c8 commit a1b36ea

29 files changed

+81
-176
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ linters:
4949
chart-versions:
5050
deny:
5151
- pkg: "^github.com/redpanda-data/redpanda-operator/charts/redpanda$"
52-
desc: 'use "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"'
52+
desc: 'use "github.com/redpanda-data/redpanda-operator/charts/redpanda/v25"'
5353
- pkg: "^github.com/redpanda-data/redpanda-operator/charts$"
5454
desc: 'import specific charts, the overarching charts module is now deprecated'
5555

‎operator/api/redpanda/v1alpha2/redpanda_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"k8s.io/client-go/rest"
2424
"k8s.io/utils/ptr"
2525

26-
redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
26+
redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v25"
2727
"github.com/redpanda-data/redpanda-operator/gotohelm/helmette"
2828
vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
2929
)

‎operator/api/redpanda/v1alpha2/redpanda_types_test.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
"github.com/redpanda-data/redpanda-operator/charts/connectors"
3434
"github.com/redpanda-data/redpanda-operator/charts/console/v3"
35-
"github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
35+
"github.com/redpanda-data/redpanda-operator/charts/redpanda/v25"
3636
"github.com/redpanda-data/redpanda-operator/operator/api/apiutil"
3737
redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
3838
"github.com/redpanda-data/redpanda-operator/operator/internal/testutils"
@@ -126,6 +126,12 @@ func TestRedpanda_ValuesJSON(t *testing.T) {
126126
// cluster spec is byte of byte compatible with the values that the helm chart
127127
// accepts.
128128
func TestHelmValuesCompat(t *testing.T) {
129+
t.Skip(`
130+
Tbis is currently skipped due to the mismatch with the CRD and the
131+
movement in the Helm chart to leveraging a top-level PodTemplate. Please unskip
132+
the test once CRD marshaling takes into account the top-level PodTemplate, which
133+
should happen before 25.1.1 is marked as a GA.
134+
`)
129135
cfg := rapid.MakeConfig{
130136
Types: map[reflect.Type]*rapid.Generator[any]{
131137
reflect.TypeFor[intstr.IntOrString](): IntOrString.AsAny(),

‎operator/go.mod‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ require (
2929
github.com/redpanda-data/common-go/secrets v0.1.3
3030
github.com/redpanda-data/console/backend v0.0.0-20240303221210-05d5d9e85f20
3131
github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-20250324171046-34430507e756
32-
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.0.0-20250324171046-34430507e756
33-
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.0.0-20250325145836-f7393134f8f4
34-
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250321104408-a6c0672707ab
32+
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.0.0
33+
github.com/redpanda-data/redpanda-operator/charts/redpanda/v25 v25.0.0-00010101000000-000000000000
34+
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250327164623-c3883a149a17
3535
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250328114403-0fc6b9d24a38
3636
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20240827155712-244863ea0ae8
3737
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
@@ -338,6 +338,10 @@ replace (
338338
// go.opentelemetry.io/otel/sdk
339339
github.com/google/cel-go => github.com/google/cel-go v0.17.8
340340

341+
// now that operator no longer leverages flux, just reference the local
342+
// chart definition for our structs
343+
github.com/redpanda-data/redpanda-operator/charts/redpanda/v25 => ../charts/redpanda
344+
341345
// Roughly equivalent to redpanda chart version v5.9.19. pkg, connectors, and console are inherited from redpanda.
342346
// TODO it may behoove us to split gotohelm into it's own module out of pkg so the operator doesn't have to follow redpanda.
343347
// github.com/redpanda-data/redpanda-operator/charts/redpanda => ../charts/redpanda

‎operator/go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,12 +741,10 @@ github.com/redpanda-data/console/backend v0.0.0-20240303221210-05d5d9e85f20 h1:+
741741
github.com/redpanda-data/console/backend v0.0.0-20240303221210-05d5d9e85f20/go.mod h1:DC42/3+k5PefSo4IalYbDN3yRZrVFP0b69+gC/NwGd4=
742742
github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-20250324171046-34430507e756 h1:Ej60mXTkl+Gg3EV4QiKYtmW0rJ1BHyVGoFwJ4DwjvGc=
743743
github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-20250324171046-34430507e756/go.mod h1:c9U+W6CCLWHWk9jBEzzUM7Q7ya4ot57FghxtaVdMrNQ=
744-
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.0.0-20250324171046-34430507e756 h1:5t2kJdC2lL/s2JIp3q0bCXxaYjTUo4f6rx3/5r5q9No=
745-
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.0.0-20250324171046-34430507e756/go.mod h1:rM1G0g5+l5GykYQId/2C09Gfo5IUMIznW7uUjuzicP4=
746-
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.0.0-20250325145836-f7393134f8f4 h1:3WscsyoRkPqOx1ZAFTkEvaNupfdThzF5kPw7izqLpTc=
747-
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.0.0-20250325145836-f7393134f8f4/go.mod h1:H26FUPjOr4VfTbqtxySNqBq5Dv0IJ/xF0jfqRjOOqe8=
748-
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250321104408-a6c0672707ab h1:aa1fDNQ2IqVM7Y45RgoJUABwfvVa4pgVIAu51tD7nOo=
749-
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250321104408-a6c0672707ab/go.mod h1:QkZMtADhtFgS5Bixk6N931yazp9mBtQ7VAJ5gWPrsgg=
744+
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.0.0 h1:S7fmi5TAlj+5GBU8UKhELscg5BpzQBWQynuSDxujPKQ=
745+
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.0.0/go.mod h1:AQWidq2TAeQZbwbrGc/1JcdxUK9aAd5B08SVePxRy3I=
746+
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250327164623-c3883a149a17 h1:aARsVhc9XYhrC/aeJpDHnel8QicHbo6BtZzbhqe33UY=
747+
github.com/redpanda-data/redpanda-operator/gotohelm v0.0.0-20250327164623-c3883a149a17/go.mod h1:QkZMtADhtFgS5Bixk6N931yazp9mBtQ7VAJ5gWPrsgg=
750748
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250328114403-0fc6b9d24a38 h1:6dqTsDtXqW4SICnuDFpKpVXFPQAJWTo/HA885UQ6wD0=
751749
github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250328114403-0fc6b9d24a38/go.mod h1:s76fz8ecr9vdhO66k5ZH9jQV9ioOrbm6CbBZgjeglNw=
752750
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20240827155712-244863ea0ae8 h1:uTQKqF8UPNxYxKBJ11VlG6Vt2l9ctkkeXsmmjHUSUG4=

‎operator/internal/controller/redpanda/redpanda_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"sigs.k8s.io/controller-runtime/pkg/predicate"
3939
"sigs.k8s.io/yaml"
4040

41-
"github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
41+
"github.com/redpanda-data/redpanda-operator/charts/redpanda/v25"
4242
"github.com/redpanda-data/redpanda-operator/gotohelm/helmette"
4343
redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
4444
"github.com/redpanda-data/redpanda-operator/operator/cmd/syncclusterconfig"

‎operator/internal/controller/redpanda/redpanda_controller_test.go‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
ctrl "sigs.k8s.io/controller-runtime"
3838
"sigs.k8s.io/controller-runtime/pkg/client"
3939

40-
redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
40+
redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v25"
4141
"github.com/redpanda-data/redpanda-operator/gotohelm/helmette"
4242
redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
4343
crds "github.com/redpanda-data/redpanda-operator/operator/config/crd/bases"
@@ -150,6 +150,8 @@ func (s *RedpandaControllerSuite) TestObjectsGCed() {
150150
}
151151

152152
func (s *RedpandaControllerSuite) TestTPLValues() {
153+
s.T().Skip("invalid / broken due to changes in chart v25.1.1 (podTemplate)")
154+
153155
rp := s.minimalRP()
154156

155157
extraVolumeMount := ptr.To(`- name: test-extra-volume
@@ -548,24 +550,6 @@ func (s *RedpandaControllerSuite) TestLicense() {
548550
}
549551
}
550552

551-
func (s *RedpandaControllerSuite) TestConnectorsIntegration() {
552-
rp := s.minimalRP()
553-
554-
rp.Spec.ClusterSpec.Connectors = &redpandav1alpha2.RedpandaConnectors{
555-
Enabled: ptr.To(true),
556-
}
557-
558-
s.applyAndWait(rp)
559-
560-
// Assert that we see the connectors deployment and that it's healthy.
561-
var deployments appsv1.DeploymentList
562-
s.NoError(s.client.List(s.ctx, &deployments))
563-
s.Len(deployments.Items, 1)
564-
s.Equal(int32(1), deployments.Items[0].Status.ReadyReplicas)
565-
566-
s.deleteAndWait(rp)
567-
}
568-
569553
func (s *RedpandaControllerSuite) SetupSuite() {
570554
t := s.T()
571555

‎operator/internal/controller/vectorized/cluster_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
"sigs.k8s.io/controller-runtime/pkg/predicate"
4040
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4141

42-
redpanda "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5/client"
42+
redpanda "github.com/redpanda-data/redpanda-operator/charts/redpanda/v25/client"
4343
vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
4444
adminutils "github.com/redpanda-data/redpanda-operator/operator/pkg/admin"
4545
"github.com/redpanda-data/redpanda-operator/operator/pkg/labels"

‎operator/internal/controller/vectorized/test/suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
logf "sigs.k8s.io/controller-runtime/pkg/log"
3636
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3737

38-
redpanda "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5/client"
38+
redpanda "github.com/redpanda-data/redpanda-operator/charts/redpanda/v25/client"
3939
redpandav1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha1"
4040
redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
4141
vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"

‎operator/internal/lifecycle/testdata/cases.pools.golden.txtar‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
cluster.redpanda.com/namespace: basic-test
1212
cluster.redpanda.com/operator: v2
1313
cluster.redpanda.com/owner: basic-test
14-
helm.sh/chart: redpanda-5.9.20
14+
helm.sh/chart: redpanda-25.1.1-beta1
1515
helm.toolkit.fluxcd.io/name: basic-test
1616
helm.toolkit.fluxcd.io/namespace: basic-test
1717
name: basic-test
@@ -35,7 +35,7 @@
3535
app.kubernetes.io/instance: basic-test
3636
app.kubernetes.io/managed-by: Helm
3737
app.kubernetes.io/name: redpanda
38-
helm.sh/chart: redpanda-5.9.20
38+
helm.sh/chart: redpanda-25.1.1-beta1
3939
redpanda.com/poddisruptionbudget: basic-test
4040
spec:
4141
affinity:
@@ -67,7 +67,7 @@
6767
valueFrom:
6868
fieldRef:
6969
fieldPath: status.hostIP
70-
image: docker.redpanda.com/redpandadata/redpanda:v24.3.6
70+
image: docker.redpanda.com/redpandadata/redpanda:v25.1.1
7171
lifecycle:
7272
postStart:
7373
exec:
@@ -117,9 +117,6 @@
117117
limits:
118118
cpu: "1"
119119
memory: 2560Mi
120-
securityContext:
121-
runAsGroup: 101
122-
runAsUser: 101
123120
startupProbe:
124121
exec:
125122
command:
@@ -183,7 +180,6 @@
183180
periodSeconds: 10
184181
successThreshold: 1
185182
resources: {}
186-
securityContext: {}
187183
volumeMounts:
188184
- mountPath: /etc/tls/certs/default
189185
name: redpanda-default-cert
@@ -199,7 +195,7 @@
199195
- /bin/bash
200196
- -c
201197
- rpk redpanda tune all
202-
image: docker.redpanda.com/redpandadata/redpanda:v24.3.6
198+
image: docker.redpanda.com/redpandadata/redpanda:v25.1.1
203199
name: tuning
204200
resources: {}
205201
securityContext:
@@ -237,12 +233,9 @@
237233
fieldRef:
238234
apiVersion: v1
239235
fieldPath: status.hostIP
240-
image: docker.redpanda.com/redpandadata/redpanda:v24.3.6
236+
image: docker.redpanda.com/redpandadata/redpanda:v25.1.1
241237
name: redpanda-configurator
242238
resources: {}
243-
securityContext:
244-
runAsGroup: 101
245-
runAsUser: 101
246239
volumeMounts:
247240
- mountPath: /etc/tls/certs/default
248241
name: redpanda-default-cert
@@ -281,6 +274,7 @@
281274
securityContext:
282275
fsGroup: 101
283276
fsGroupChangePolicy: OnRootMismatch
277+
runAsUser: 101
284278
serviceAccountName: default
285279
terminationGracePeriodSeconds: 90
286280
topologySpreadConstraints:

0 commit comments

Comments
 (0)