sync: operator v2.4.1

Reference
redpanda-data/redpanda-operator#683

Author: RafalKorepta

.github/workflows/test_operator.yaml

@@ -55,7 +55,7 @@ jobs:
         run: task helm:install:cert-manager
       - name: Install CRDs
         run: |
-          kubectl kustomize https://github.com/redpanda-data/redpanda-operator//src/go/k8s/config/crd?ref="$(yq -r .appVersion charts/operator/Chart.yaml)" | kubectl apply --server-side -f -
+          kubectl kustomize https://github.com/redpanda-data/redpanda-operator//operator/config/crd?ref="$(yq -r .appVersion charts/operator/Chart.yaml)" | kubectl apply --server-side -f -
         # Chart-testing requires there to be a branch on the local repository
         # for diffing. This will create such a branch without performing a
         # checkout.

Taskfile.yaml

@@ -184,9 +184,9 @@ tasks:
   sync:operator:chart:
     - task: sync:chart
       vars:
-        REF: e92ffb8a05a6a35011a24bcda65c094cc6464187 # operator v0.4.41
+        REF: d22c033b9e7989ae471c052f1536b97242f8b539 # operator/v2.4.1 with chart specific fixes.
         LOCAL_DIR: charts/operator
-        REMOTE_DIR: charts/operator
+        REMOTE_DIR: operator/chart
 
   sync:console:chart:
     - task: sync:chart
@@ -208,6 +208,7 @@ tasks:
       - rm -rf '{{ .SRC_DIR }}/{{ .LOCAL_DIR }}'
       - mkdir -p '{{ .SRC_DIR }}/{{ .LOCAL_DIR }}'
       - |
+        cd {{ .LOCAL_DIR }} && \
         curl -Lo - 'https://github.com/redpanda-data/redpanda-operator/archive/{{ .REF }}.tar.gz' | \
         tar \
           --gunzip \
@@ -218,5 +219,5 @@ tasks:
           --exclude 'go.sum' \
           --exclude '*.txtar' \
           --exclude '.changes' \
-          --strip-components 1 \
+          --strip-components {{ (.REMOTE_DIR | split "/" | len) | add 1 }} \
           '*/{{ .REMOTE_DIR }}'

charts/operator/CHANGELOG.md

@@ -3,30 +3,19 @@ name: operator
 description: Redpanda operator helm chart
 type: application
 
-# The chart version and the app version are not the same and will not track
-# together. The chart version is a semver representation of changes to this
-# chart.
-version: 0.4.40
-
-# This is the default version of the operator being deployed.
-# ** NOTE for maintainers: please enssure the artifacthub image annotation is updated before merging
-appVersion: v2.3.8-24.3.6
-
+# The operator helm chart is considered part of the operator itself. Therefore
+# version == appVersion.
+version: v2.4.1
+appVersion: v2.4.1
 kubeVersion: ">= 1.25.0-0"
 
 sources:
-  - https://github.com/redpanda-data/redpanda-operator/tree/main/charts/operator
+  - https://github.com/redpanda-data/redpanda-operator/tree/main/operator/chart
 icon: https://go.redpanda.com/hubfs/Redpandas/operator-panda.png
 maintainers:
   - name: redpanda-data
     url: https://github.com/orgs/redpanda-data/people
 
-dependencies:
-- name: kube-prometheus-stack
-  condition: monitoring.deployPrometheusKubeStack
-  version: 51.2.0
-  repository: https://prometheus-community.github.io/helm-charts
-
 annotations:
   artifacthub.io/license: Apache-2.0
   artifacthub.io/links: |
@@ -36,13 +25,9 @@ annotations:
       url: https://helm.sh/docs/intro/install/
   artifacthub.io/images: |
     - name: redpanda-operator
-      image: docker.redpanda.com/redpandadata/redpanda-operator:v2.3.8-24.3.6
-    - name: configurator
-      image: docker.redpanda.com/redpandadata/configurator:v2.3.8-24.3.6
+      image: docker.redpanda.com/redpandadata/redpanda-operator:v2.4.1
     - name: redpanda
-      image: docker.redpanda.com/redpandadata/redpanda:v24.3.6
-    - name: kube-rbac-proxy
-      image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.0
+      image: docker.redpanda.com/redpandadata/redpanda:v25.1.1
   artifacthub.io/crds: |
     - kind: Redpanda
       version: v1alpha1

charts/operator/Chart.yaml

@@ -3,9 +3,9 @@
 description: Find the default values and descriptions of settings in the Redpanda Operator Helm chart.
 ---
 
-![Version: 0.4.40](https://img.shields.io/badge/Version-0.4.40-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.3.8-24.3.6](https://img.shields.io/badge/AppVersion-v2.3.8--24.3.6-informational?style=flat-square)
+![Version: v2.4.1](https://img.shields.io/badge/Version-v2.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.4.1](https://img.shields.io/badge/AppVersion-v2.4.1-informational?style=flat-square)
 
-This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](https://github.com/redpanda-data/helm-charts/blob/main/charts/operator/values.yaml). Each of the settings is listed and described on this page, along with any default values.
+This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](./values.yaml). Each of the settings is listed and described on this page, along with any default values.
 
 For instructions on how to install and use the chart, including how to override and customize the chart’s values, refer to the [deployment documentation](https://docs.redpanda.com/docs/deploy/deployment-option/self-hosted/kubernetes/kubernetes-deploy/).
 
@@ -14,27 +14,19 @@ Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/n
 
 ## Source Code
 
-* <https://github.com/redpanda-data/redpanda-operator/tree/main/charts/operator>
+* <https://github.com/redpanda-data/redpanda-operator/tree/main/operator/chart>
 
 ## Requirements
 
 Kubernetes: `>= 1.25.0-0`
 
-| Repository | Name | Version |
-|------------|------|---------|
-| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 51.2.0 |
-
 ## Settings
 
 ### [additionalCmdFlags](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=additionalCmdFlags)
 
 Passes additional flags to the Redpanda Operator at startup. Additional flags include:  - `--additional-controllers`: Additional controllers to deploy. Valid values are nodeWatcher or decommission. For more information about the Nodewatcher controller, see [Install the Nodewatcher controller](https://docs.redpanda.com/current/manage/kubernetes/k-scale-redpanda/#node-pvc). For more information about the Decommission controller, see [Use the Decommission controller](https://docs.redpanda.com/current/manage/kubernetes/k-decommission-brokers/#Automated).
 
-**Default:**
-
-```
-["--configurator-tag=v2.3.6-24.3.3"]
-```
+**Default:** `[]`
 
 ### [affinity](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=affinity)
 
@@ -226,17 +218,7 @@ Log level Valid values (from least to most verbose) are: `warn`, `info`, `debug`
 
 Configuration for monitoring.
 
-**Default:**
-
-```
-{"deployPrometheusKubeStack":false,"enabled":false}
-```
-
-### [monitoring.deployPrometheusKubeStack](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=monitoring.deployPrometheusKubeStack)
-
-Deploys the [Prometheus community Helm chart](https://prometheus-community.github.io/helm-charts/).
-
-**Default:** `false`
+**Default:** `{"enabled":false}`
 
 ### [monitoring.enabled](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=monitoring.enabled)
 
@@ -258,8 +240,6 @@ Node selection constraints for scheduling Pods on specific nodes. For details, s
 
 ### [podAnnotations](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=podAnnotations)
 
-Sets deployment strategy. For details, see the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy). strategy: "" Sets additional annotations for Pods.
-
 **Default:** `{}`
 
 ### [podLabels](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=podLabels)
@@ -354,6 +334,12 @@ Specifies whether a service account should be created.
 
 **Default:** `true`
 
+### [strategy](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=strategy)
+
+Sets deployment strategy. For details, see the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy).
+
+**Default:** `{"type":"RollingUpdate"}`
+
 ### [tolerations](https://artifacthub.io/packages/helm/redpanda-data/operator?modal=values&path=tolerations)
 
 Taints to be tolerated by Pods. For details, see the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/).

charts/operator/README.md

@@ -6,7 +6,7 @@ description: Find the default values and descriptions of settings in the Redpand
 {{- end -}}
 
 {{ define "chart.description" -}}
-This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](https://github.com/redpanda-data/helm-charts/blob/main/charts/operator/values.yaml). Each of the settings is listed and described on this page, along with any default values.
+This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](./values.yaml). Each of the settings is listed and described on this page, along with any default values.
 
 For instructions on how to install and use the chart, including how to override and customize the chart’s values, refer to the [deployment documentation](https://docs.redpanda.com/docs/deploy/deployment-option/self-hosted/kubernetes/kubernetes-deploy/).
 {{ end -}}

charts/operator/README.md.gotmpl

@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-scope: Cluster
-webhook:
-  enabled: true
-logLevel: debug
+# Cluster scope appears to be broken but is not end user facing so this is disabled for now.
+# scope: Cluster
+# webhook:
+#   enabled: true
+# logLevel: debug

charts/operator/ci/02-cluster-values.yaml

@@ -5,7 +5,7 @@ metadata:
   name: cluster-tls
 spec:
   image: "docker.redpanda.com/redpandadata/redpanda"
-  version: "v24.2.1"
+  version: "v25.1.1"
   replicas: 3
   resources:
     requests:
@@ -26,4 +26,4 @@ spec:
     - port: 9644
     pandaproxyApi:
     - port: 8082
-    developerMode: true
+    developerMode: true

charts/operator/files/three_node_cluster.yaml

@@ -3,14 +3,12 @@ kind: Redpanda
 metadata:
   name: cluster-tls
 spec:
-  chartRef:
-    chartVersion: ">4.0.0"
   clusterSpec:
     console:
       enabled: false
     image:
       repository: docker.redpanda.com/redpandadata/redpanda
-      tag: v24.2.1
+      tag: v25.1.1
     listeners:
       admin:
         external: {}

charts/operator/files/three_node_redpanda.yaml

@@ -11,7 +11,7 @@
 {{- break -}}
 {{- end -}}
 {{- $_is_returning = true -}}
-{{- (dict "r" (mustMergeOverwrite (dict "metadata" (dict "creationTimestamp" (coalesce nil) ) "spec" (dict "secretName" "" "issuerRef" (dict "name" "" ) ) "status" (dict ) ) (mustMergeOverwrite (dict ) (dict "apiVersion" "cert-manager.io/v1" "kind" "Certificate" )) (dict "metadata" (mustMergeOverwrite (dict "creationTimestamp" (coalesce nil) ) (dict "name" "redpanda-serving-cert" "namespace" $dot.Release.Namespace "labels" (get (fromJson (include "operator.Labels" (dict "a" (list $dot) ))) "r") "annotations" $values.annotations )) "spec" (mustMergeOverwrite (dict "secretName" "" "issuerRef" (dict "name" "" ) ) (dict "dnsNames" (list (printf "%s-webhook-service.%s.svc" (get (fromJson (include "operator.RedpandaOperatorName" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace) (printf "%s-webhook-service.%s.svc.%s" (get (fromJson (include "operator.RedpandaOperatorName" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace $values.clusterDomain)) "issuerRef" (mustMergeOverwrite (dict "name" "" ) (dict "kind" "Issuer" "name" (get (fromJson (include "operator.cleanForK8sWithSuffix" (dict "a" (list (get (fromJson (include "operator.Fullname" (dict "a" (list $dot) ))) "r") "selfsigned-issuer") ))) "r") )) "secretName" $values.webhookSecretName "privateKey" (mustMergeOverwrite (dict ) (dict "rotationPolicy" "Never" )) )) ))) | toJson -}}
+{{- (dict "r" (mustMergeOverwrite (dict "metadata" (dict "creationTimestamp" (coalesce nil) ) "spec" (dict "secretName" "" "issuerRef" (dict "name" "" ) ) "status" (dict ) ) (mustMergeOverwrite (dict ) (dict "apiVersion" "cert-manager.io/v1" "kind" "Certificate" )) (dict "metadata" (mustMergeOverwrite (dict "creationTimestamp" (coalesce nil) ) (dict "name" "redpanda-serving-cert" "namespace" $dot.Release.Namespace "labels" (get (fromJson (include "operator.Labels" (dict "a" (list $dot) ))) "r") "annotations" $values.annotations )) "spec" (mustMergeOverwrite (dict "secretName" "" "issuerRef" (dict "name" "" ) ) (dict "dnsNames" (list (printf "%s-webhook-service.%s.svc" (get (fromJson (include "operator.Name" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace) (printf "%s-webhook-service.%s.svc.%s" (get (fromJson (include "operator.Name" (dict "a" (list $dot) ))) "r") $dot.Release.Namespace $values.clusterDomain)) "issuerRef" (mustMergeOverwrite (dict "name" "" ) (dict "kind" "Issuer" "name" (get (fromJson (include "operator.cleanForK8sWithSuffix" (dict "a" (list (get (fromJson (include "operator.Fullname" (dict "a" (list $dot) ))) "r") "selfsigned-issuer") ))) "r") )) "secretName" $values.webhookSecretName "privateKey" (mustMergeOverwrite (dict ) (dict "rotationPolicy" "Never" )) )) ))) | toJson -}}
 {{- break -}}
 {{- end -}}
 {{- end -}}