operator: Align Redpanda helm chart go module to match 5.9.21 release

Author: RafalKorepta

.golangci.yml

@@ -7,6 +7,7 @@ linters:
   - gci
   - gocritic
   - gofumpt
+  - gomodguard
   - gosec
   - gosimple
   - govet
@@ -30,6 +31,15 @@ linters-settings:
     no-inline-comments: false
     no-prefix-comments: false
 
+  gomodguard:
+    blocked:
+      modules:
+        - "github.com/redpanda-data/redpanda-operator/charts/redpanda":
+            reason: "The redpanda chart must be imported from a versioned module"
+            recommendations:
+              - github.com/redpanda-data/redpanda-operator/charts/redpanda/v5
+
+
   gosec:
     excludes:
     - G115 # integer overflows aren't super likely to be a problem for us and we're really just at the mercy of the APIs we use.

operator/api/redpanda/v1alpha2/redpanda_types.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/utils/ptr"
 
-	redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda"
+	redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
 	vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
 	"github.com/redpanda-data/redpanda-operator/pkg/gotohelm/helmette"
 	"github.com/redpanda-data/redpanda-operator/pkg/kube"
@@ -60,7 +60,7 @@ type ChartRef struct {
 	// This ties the operator to a specific version of the Go-based Redpanda Helm chart, causing all other
 	// ChartRef fields to be ignored.
 	//
-	// Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.20` or the corresponding
+	// Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.21` or the corresponding
 	// version of the Redpanda chart.
 	//
 	// Note: When `useFlux` is set to `false`, `RedpandaStatus` may become inaccurate if the HelmRelease is

operator/api/redpanda/v1alpha2/redpanda_types_test.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/redpanda-data/redpanda-operator/charts/connectors"
 	"github.com/redpanda-data/redpanda-operator/charts/console"
-	"github.com/redpanda-data/redpanda-operator/charts/redpanda"
+	"github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
 	"github.com/redpanda-data/redpanda-operator/operator/api/apiutil"
 	redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
 	crds "github.com/redpanda-data/redpanda-operator/operator/config/crd/bases"
@@ -143,13 +143,14 @@ func TestRedpanda_ValuesJSON(t *testing.T) {
 func TestHelmValuesCompat(t *testing.T) {
 	cfg := rapid.MakeConfig{
 		Types: map[reflect.Type]*rapid.Generator[any]{
-			reflect.TypeFor[intstr.IntOrString](): IntOrString.AsAny(),
-			reflect.TypeFor[*resource.Quantity](): Quantity.AsAny(),
-			reflect.TypeFor[metav1.Duration]():    Duration.AsAny(),
-			reflect.TypeFor[metav1.Time]():        Time.AsAny(),
-			reflect.TypeFor[any]():                rapid.Just[any](nil), // Return nil for all untyped (any, interface{}) fields.
-			reflect.TypeFor[*metav1.FieldsV1]():   rapid.Just[any](nil), // Return nil for K8s accounting fields.
-			reflect.TypeFor[corev1.Probe]():       Probe.AsAny(),        // We use the Probe type to simplify typing but it's serialization isn't fully "partial" which is acceptable.
+			reflect.TypeFor[intstr.IntOrString]():        IntOrString.AsAny(),
+			reflect.TypeFor[*resource.Quantity]():        Quantity.AsAny(),
+			reflect.TypeFor[metav1.Duration]():           Duration.AsAny(),
+			reflect.TypeFor[metav1.Time]():               Time.AsAny(),
+			reflect.TypeFor[any]():                       rapid.Just[any](nil), // Return nil for all untyped (any, interface{}) fields.
+			reflect.TypeFor[*metav1.FieldsV1]():          rapid.Just[any](nil), // Return nil for K8s accounting fields.
+			reflect.TypeFor[corev1.Probe]():              Probe.AsAny(),        // We use the Probe type to simplify typing but it's serialization isn't fully "partial" which is acceptable.
+			reflect.TypeFor[*redpanda.PartialSidecars](): rapid.Just[any](nil), // Intentionally not included in the operator as the operator handles this itself.
 		},
 		Fields: map[reflect.Type]map[string]*rapid.Generator[any]{
 			reflect.TypeFor[redpanda.PartialValues](): {

operator/api/redpanda/v1alpha2/testdata/crd-docs.adoc

@@ -405,7 +405,7 @@ This ties the operator to a specific version of the Go-based Redpanda Helm chart
 ChartRef fields to be ignored. +
 
 
-Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.20` or the corresponding +
+Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.21` or the corresponding +
 version of the Redpanda chart. +
 
 

operator/config/crd/bases/cluster.redpanda.com_redpandas.yaml

@@ -120,7 +120,7 @@ spec:
                       This ties the operator to a specific version of the Go-based Redpanda Helm chart, causing all other
                       ChartRef fields to be ignored.
 
-                      Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.20` or the corresponding
+                      Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.21` or the corresponding
                       version of the Redpanda chart.
 
                       Note: When `useFlux` is set to `false`, `RedpandaStatus` may become inaccurate if the HelmRelease is
@@ -20387,7 +20387,7 @@ spec:
                       This ties the operator to a specific version of the Go-based Redpanda Helm chart, causing all other
                       ChartRef fields to be ignored.
 
-                      Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.20` or the corresponding
+                      Before disabling `useFlux`, ensure that your `chartVersion` is aligned with `5.9.21` or the corresponding
                       version of the Redpanda chart.
 
                       Note: When `useFlux` is set to `false`, `RedpandaStatus` may become inaccurate if the HelmRelease is

operator/go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/redpanda-data/console/backend v0.0.0-20240303221210-05d5d9e85f20
 	github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-20250129114027-a89e202aea86
 	github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250129114027-a89e202aea86
-	github.com/redpanda-data/redpanda-operator/charts/redpanda v0.0.0-20250207141022-1388ec6c6b63
+	github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.9.21
 	github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250206213012-3bb78bb0f17f
 	github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20240827155712-244863ea0ae8
 	github.com/scalalang2/golang-fifo v1.0.2

operator/go.sum

@@ -1103,8 +1103,8 @@ github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-202501291140
 github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-20250129114027-a89e202aea86/go.mod h1:VTE5b2s0AWj/gJ1ygVXbfMaDKd6mmxiIgbw32hD2w94=
 github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250129114027-a89e202aea86 h1:OIMgob/yXf+LmtfBd4D9URQs3ULGZmjnCLwbTb61kb0=
 github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250129114027-a89e202aea86/go.mod h1:uMzbKxddryc+t69uOI6U7yTaXAVqjEtZ6gGH3sszgIk=
-github.com/redpanda-data/redpanda-operator/charts/redpanda v0.0.0-20250207141022-1388ec6c6b63 h1:ANC+jxOUwNNNid1+7ni6SX6UhQlB6TkROIyE3vuXqeM=
-github.com/redpanda-data/redpanda-operator/charts/redpanda v0.0.0-20250207141022-1388ec6c6b63/go.mod h1:hqkCJt09li/REYBgJ/O32gBxHTUhAaLqCRoVhj0Er+o=
+github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.9.21 h1:81YaoI/WHrrrdC6+o00O1LQJ5GZZw5Bp+YkOTmBKE6U=
+github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.9.21/go.mod h1:ddEPHeeGL8bgxSVjPsu2djVaM7imOruuAbmIl9CTPh0=
 github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250206213012-3bb78bb0f17f h1:JY/VwWH44/wYDbfalLAQeqY5r1xeh1UXXX+d052T54M=
 github.com/redpanda-data/redpanda-operator/pkg v0.0.0-20250206213012-3bb78bb0f17f/go.mod h1:jstEIOVRim07DsGZbS3+ljpk+dziWMd0QFF2g4MPRJI=
 github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20240827155712-244863ea0ae8 h1:uTQKqF8UPNxYxKBJ11VlG6Vt2l9ctkkeXsmmjHUSUG4=

operator/internal/controller/redpanda/redpanda_controller.go

@@ -44,7 +44,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/yaml"
 
-	"github.com/redpanda-data/redpanda-operator/charts/redpanda"
+	"github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
 	redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
 	"github.com/redpanda-data/redpanda-operator/operator/cmd/syncclusterconfig"
 	internalclient "github.com/redpanda-data/redpanda-operator/operator/pkg/client"

operator/internal/controller/redpanda/redpanda_controller_test.go

@@ -47,7 +47,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda"
+	redpandachart "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5"
 	redpandav1alpha2 "github.com/redpanda-data/redpanda-operator/operator/api/redpanda/v1alpha2"
 	crds "github.com/redpanda-data/redpanda-operator/operator/config/crd/bases"
 	"github.com/redpanda-data/redpanda-operator/operator/internal/controller"

operator/internal/controller/vectorized/cluster_controller.go

@@ -39,7 +39,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	redpanda "github.com/redpanda-data/redpanda-operator/charts/redpanda/client"
+	redpanda "github.com/redpanda-data/redpanda-operator/charts/redpanda/v5/client"
 	vectorizedv1alpha1 "github.com/redpanda-data/redpanda-operator/operator/api/vectorized/v1alpha1"
 	adminutils "github.com/redpanda-data/redpanda-operator/operator/pkg/admin"
 	"github.com/redpanda-data/redpanda-operator/operator/pkg/labels"