[CC-33024] Remove the deprecated fields of CockroachDB operator

Author: prafull01

build/templates/cockroachdb-parent/charts/cockroachdb/values.yaml

@@ -168,14 +168,6 @@ cockroachdb:
     clusterSettings: ~
     # timestamp captures the annotation timestamp used for rolling restarts.
     timestamp: "2021-10-18T00:00:00Z"
-    # resources captures the resource requests and limits for CockroachDB pods.
-    resources: ~
-      # limits:
-      #   cpu: 4000m
-      #   memory: 16Gi
-      # requests:
-      #   cpu: 4000m
-      #   memory: 16Gi
     # dataStore captures the disk configuration for CockroachDB storage.
     dataStore:
       # volumeClaimTemplate captures the PVC template for storage.
@@ -276,9 +268,6 @@ cockroachdb:
       # If not set, the default provisioner will be chosen (gp2 on AWS, standard on GKE).
       # storageClassName: ""
       #
-    # podLabels captures additional labels to apply to CockroachDB pods.
-    podLabels:
-      app.kubernetes.io/component: cockroachdb
     # startFlags specify the flags that will be used for starting the cluster.
     # Any flag defined in here will take precedence over the first-class
     # fields responsible for setting the same flags.
@@ -290,25 +279,8 @@ cockroachdb:
       # # omit defines a set of flags which will be omitted from the start command.
       # omit:
       #   - ""
-    # env captures environment variables set on CockroachDB pods.
-    env: []
-      # - name: APP_NAME
-      #   value: "CRDB"
-      # - name: POD_NAME
-      #   valueFrom:
-      #     fieldRef:
-      #       fieldPath: metadata.name
     # rollingRestartDelay specifies the delay between rolling restarts of CockroachDB pods.
     rollingRestartDelay: 30s
-    # topologySpreadConstraints captures pod topology spread constraints.
-    # It is recommended to spread CockroachDB pods across zones to ensure high availability.
-    topologySpreadConstraints:
-        # maxSkew defines the degree to which the pods can be unevenly distributed.
-      - maxSkew: 1
-        # topologyKey defines the key for topology spread.
-        topologyKey: topology.kubernetes.io/zone
-        # whenUnsatisfiable defines the behavior when constraints cannot be met.
-        whenUnsatisfiable: DoNotSchedule
     # service captures the Kubernetes Service configurations for CockroachDB pods.
     service:
       # ports captures the service port definitions.
@@ -355,43 +327,6 @@ cockroachdb:
           ingressClassName: ""
           annotations: {}
           host: ""
-    # podAnnotations captures annotations to apply to CockroachDB pods.
-    podAnnotations: {}
-    # terminationGracePeriod determines the time available to CockroachDB for graceful drain.
-    # It follows the metav1.Duration format, e.g., "300s", "5m" or "1h".
-    # terminationGracePeriod: "300s"
-    # nodeSelector captures the node selector labels for scheduling pods.
-    nodeSelector: {}
-    # affinity captures scheduling affinity rules for CockroachDB pods.
-    affinity:
-      # nodeAffinity:
-      #   requiredDuringSchedulingIgnoredDuringExecution:
-      #     nodeSelectorTerms:
-      #       - matchExpressions:
-      #           - key: kubernetes.io/os
-      #             operator: In
-      #             values:
-      #               - linux
-      # podAffinity:
-      #   requiredDuringSchedulingIgnoredDuringExecution:
-      #     - labelSelector:
-      #         matchExpressions:
-      #           - key: security
-      #             operator: In
-      #             values:
-      #               - S1
-      #       topologyKey: topology.kubernetes.io/zone
-      # podAntiAffinity:
-      #   preferredDuringSchedulingIgnoredDuringExecution:
-      #     - weight: 100
-      #       podAffinityTerm:
-      #         labelSelector:
-      #           matchExpressions:
-      #             - key: security
-      #               operator: In
-      #               values:
-      #                 - S2
-      #         topologyKey: topology.kubernetes.io/zone
       #
     # sideCars captures the configuration for sidecar containers.
     sideCars:
@@ -401,8 +336,6 @@ cockroachdb:
       containers: []
       # volumes captures additional volumes for CockroachDB pods.
       volumes: []
-    # tolerations captures the tolerations for scheduling CockroachDB pods.
-    tolerations: []
     # localityLabels captures labels used to determine node locality.
     # It is an ordered, comma-separated list of keys that which must be present as labels on the nodes.
     # For region and zone to be part of the locality, the labels (topology.kubernetes.io/region, topology.kubernetes.io/region) must be set on the nodes.
@@ -457,18 +390,80 @@ cockroachdb:
     # podTemplate is an optional pod specification that overrides the default pod specification configured by the operator.
     # If specified, podTemplate is merged with the default pod specification, with settings in podTemplate taking precedence.
     # This can be used to add or update containers, volumes, and other settings of the CockroachDB pod.
-    podTemplate: {}
+    podTemplate:
       # # metadata captures the pod metadata for CockroachDB pods.
-      # metadata: {}
+      metadata:
+        labels:
+          app.kubernetes.io/component: cockroachdb
+        annotations: {}
       # # spec captures the pod specification for CockroachDB pods.
-      # spec:
+      spec:
       #   # initContainers captures the list of init containers for CockroachDB pods.
       #   initContainers:
       #     - name : cockroachdb-init
       #       image: us-docker.pkg.dev/cockroach-cloud-images/data-plane/init-container@sha256:c3e4ba851802a429c7f76c639a64b9152d206cebb31162c1760f05e98f7c4254
       #   # containers captures the list of containers for CockroachDB pods.
-      #   containers:
-      #     - name: cockroachdb
+        containers:
+          - name: cockroachdb
+            # env captures environment variables set on CockroachDB pods.
+            env: []
+              # - name: APP_NAME
+              #   value: "CRDB"
+              # - name: POD_NAME
+              #   valueFrom:
+              #     fieldRef:
+              #       fieldPath: metadata.name
+            resources: {}
+           # image: cockroachdb/cockroach:v25.2.2
+      #     - name: cert-reloader
+      #       image: us-docker.pkg.dev/cockroach-cloud-images/data-plane/inotifywait:87edf086db32734c7fa083a62d1055d664900840
+        # topologySpreadConstraints captures pod topology spread constraints.
+        # It is recommended to spread CockroachDB pods across zones to ensure high availability.
+        topologySpreadConstraints:
+            # maxSkew defines the degree to which the pods can be unevenly distributed.
+          - maxSkew: 1
+            # topologyKey defines the key for topology spread.
+            topologyKey: topology.kubernetes.io/zone
+            # whenUnsatisfiable defines the behavior when constraints cannot be met.
+            whenUnsatisfiable: DoNotSchedule
+        # terminationGracePeriodSeconds determines the time available to CockroachDB for graceful drain.
+      # terminationGracePeriodSeconds: 300
+        # tolerations captures the tolerations for pods of the self-signer job.
+        # https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+      # tolerations: []
+        # nodeSelector captures the node selector labels for scheduling pods.
+      # nodeSelector: {}
+        # affinity captures scheduling affinity rules for CockroachDB pods.
+      # affinity:
+          # nodeAffinity:
+          #   requiredDuringSchedulingIgnoredDuringExecution:
+          #     nodeSelectorTerms:
+          #       - matchExpressions:
+          #           - key: kubernetes.io/os
+          #             operator: In
+          #             values:
+          #               - linux
+          # podAffinity:
+          #   requiredDuringSchedulingIgnoredDuringExecution:
+          #     - labelSelector:
+          #         matchExpressions:
+          #           - key: security
+          #             operator: In
+          #             values:
+          #               - S1
+          #       topologyKey: topology.kubernetes.io/zone
+          # podAntiAffinity:
+          #   preferredDuringSchedulingIgnoredDuringExecution:
+          #     - weight: 100
+          #       podAffinityTerm:
+          #         labelSelector:
+          #           matchExpressions:
+          #             - key: security
+          #               operator: In
+          #               values:
+          #                 - S2
+          #         topologyKey: topology.kubernetes.io/zone
+          #
       #       image: cockroachdb/cockroach:v25.2.2
       #     - name: cert-reloader
       #       image: us-docker.pkg.dev/cockroach-cloud-images/data-plane/inotifywait:87edf086db32734c7fa083a62d1055d664900840

cockroachdb-parent/charts/cockroachdb/templates/crdb.yaml

@@ -9,7 +9,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "cluster.labels" . | nindent 4 }}
-    {{- with .Values.cockroachdb.crdbCluster.podLabels }}
+    {{- with .Values.cockroachdb.crdbCluster.podTemplate.metadata.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
     {{- with .Values.k8s.labels }}
@@ -25,9 +25,6 @@ spec:
   {{- with .Values.cockroachdb.crdbCluster.regions }}
   regions: {{- toYaml . | nindent 4 }}
   {{- end }}
-  features:
-    - reconcile
-    - reconcile-beta
   rollingRestartDelay: {{ .Values.cockroachdb.crdbCluster.rollingRestartDelay }}
   template:
     spec:
@@ -59,48 +56,12 @@ spec:
       {{- with .Values.cockroachdb.crdbCluster.walFailoverSpec }}
       walFailoverSpec: {{- toYaml . | nindent 8 }}
       {{- end }}
-      env:
-        - name: GODEBUG
-          value: {{ include "godebugList" . }}
-        {{- with .Values.cockroachdb.crdbCluster.env }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- with .Values.cockroachdb.crdbCluster.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.cockroachdb.crdbCluster.terminationGracePeriod }}
-      terminationGracePeriod: {{ .Values.cockroachdb.crdbCluster.terminationGracePeriod }}
-      {{- end }}
-      podLabels:
-        app.kubernetes.io/name: {{ template "cockroachdb.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name | quote }}
-        {{- with .Values.cockroachdb.crdbCluster.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      podAnnotations:
-        helm.sh/restartedAt: {{ .Values.cockroachdb.crdbCluster.timestamp  | quote }}
-        {{- with .Values.cockroachdb.crdbCluster.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- with .Values.cockroachdb.crdbCluster.resources }}
-      resourceRequirements: {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- with .Values.cockroachdb.crdbCluster.localityLabels }}
       localityLabels: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.cockroachdb.crdbCluster.localityMappings }}
       localityMappings: {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.cockroachdb.crdbCluster.tolerations }}
-      tolerations: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.cockroachdb.crdbCluster.nodeSelector }}
-      nodeSelector: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.cockroachdb.crdbCluster.affinity }}
-      affinity: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "cockroachdb.serviceAccount.name" . }}
       {{- if .Values.cockroachdb.crdbCluster.loggingConfigMapName }}
       loggingConfigMapName: {{ .Values.cockroachdb.crdbCluster.loggingConfigMapName }}
       {{- end }}
@@ -123,7 +84,23 @@ spec:
       startFlags: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.cockroachdb.crdbCluster.podTemplate }}
-      podTemplate: {{- toYaml . | nindent 8 }}
+      podTemplate:
+        metadata:
+          labels:
+            app.kubernetes.io/name: {{ template "cockroachdb.name" $ }}
+            app.kubernetes.io/instance: {{ $.Release.Name | quote }}
+            {{- with .metadata.labels }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          annotations:
+            helm.sh/restartedAt: {{ $.Values.cockroachdb.crdbCluster.timestamp | quote }}
+            {{- with .metadata.annotations }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+        spec:        
+            {{- $spec := deepCopy .spec }}
+            {{- $_ := set $spec "serviceAccountName" (include "cockroachdb.serviceAccount.name" $) }}
+            {{- toYaml $spec | nindent 12 }}
       {{- end }}
       {{- with .Values.cockroachdb.crdbCluster.persistentVolumeClaimRetentionPolicy }}
       persistentVolumeClaimRetentionPolicy: {{- toYaml . | nindent 8 }}

cockroachdb-parent/charts/cockroachdb/templates/service.public.yaml

@@ -34,7 +34,7 @@ spec:
   selector:
     app.kubernetes.io/name: {{ template "cockroachdb.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
-  {{- with .Values.cockroachdb.crdbCluster.podLabels }}
+  {{- with .Values.cockroachdb.crdbCluster.podTemplate.metadata.labels }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
   # Cockroach Cloud operator doesn't provide a way to change the sql,grpc and http ports for the pods. Hence, making these