Merge pull request #16578 from travisn/helm-revert-image-tag-change

helm: Revert ceph image tag change

Documentation/Helm-Charts/ceph-cluster-chart.md

@@ -63,9 +63,6 @@ The following table lists the configurable parameters of the rook-operator chart
 | `cephClusterSpec` | Cluster configuration. | See [below](#ceph-cluster-spec) |
 | `cephFileSystemVolumeSnapshotClass` | Settings for the filesystem snapshot class | See [CephFS Snapshots](../Storage-Configuration/Ceph-CSI/ceph-csi-snapshot.md#cephfs-snapshots) |
 | `cephFileSystems` | A list of CephFileSystem configurations to deploy | See [below](#ceph-file-systems) |
-| `cephImage.allowUnsupported` |  | `false` |
-| `cephImage.repository` |  | `"quay.io/ceph/ceph"` |
-| `cephImage.tag` |  | `"v19.2.3"` |
 | `cephObjectStores` | A list of CephObjectStore configurations to deploy | See [below](#ceph-object-stores) |
 | `clusterName` | The metadata.name of the CephCluster CR | The same as the namespace |
 | `configOverride` | Cluster ceph.conf override | `nil` |

deploy/charts/rook-ceph-cluster/templates/cephcluster.yaml

@@ -19,11 +19,4 @@ spec:
     interval: {{ . }}
     {{- end }}
   {{- end }}
-  {{- with .Values.cephImage }}
-  cephVersion:
-    image: "{{ .repository }}:{{ .tag }}"
-    allowUnsupported: {{ .allowUnsupported }}
-    imagePullPolicy: {{ .imagePullPolicy }}
-  {{- end }}
-
   {{- .Values.cephClusterSpec | toYaml | nindent 2 }}

deploy/charts/rook-ceph-cluster/templates/deployment.yaml

@@ -36,7 +36,7 @@ spec:
       {{- end }}
       containers:
         - name: rook-ceph-tools
-          image: {{ .Values.toolbox.image | default (printf "%s:%s" .Values.cephImage.repository .Values.cephImage.tag) }}
+          image: {{ .Values.toolbox.image | default .Values.cephClusterSpec.cephVersion.image }}
           command:
             - /bin/bash
             - -c

deploy/charts/rook-ceph-cluster/values.yaml

@@ -89,22 +89,6 @@ pspEnable: false
 # imagePullSecrets:
 # - name: my-registry-secret
 
-# Specify these values to override the Ceph image in the cephClusterSpec below.
-# If specifying these values, do not include the cephVersion section in the cephClusterSpec.
-cephImage:
-  # The repository from which to pull the ceph image
-  repository: quay.io/ceph/ceph
-  # In production, use a specific version tag instead of the general v19 flag, which pulls the latest release and could result in different
-  # versions running within the cluster. See tags available at https://hub.docker.com/r/ceph/ceph/tags/.
-  # To be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v19.2.3-20250717
-  tag: v19.2.3
-  # Whether to allow unsupported versions of Ceph. Currently Reef and Squid are supported.
-  # Future versions such as Tentacle (v20) would require this to be set to `true`.
-  # Do not set to true in production.
-  allowUnsupported: false
-  # The image pull policy for pulling the ceph image in the ceph daemon pods, defaults to IfNotPresent
-  # imagePullPolicy: IfNotPresent
-
 # All values below are taken from the CephCluster CRD
 # -- Cluster configuration.
 # @default -- See [below](#ceph-cluster-spec)
@@ -114,7 +98,20 @@ cephClusterSpec:
   # PVC-based cluster (cluster-on-pvc.yaml), external cluster (cluster-external.yaml),
   # or stretch cluster (cluster-stretched.yaml), replace this entire `cephClusterSpec`
   # with the specs from those examples.
+
   # For more details, check https://rook.io/docs/rook/v1.10/CRDs/Cluster/ceph-cluster-crd/
+  cephVersion:
+    # The container image used to launch the Ceph daemon pods (mon, mgr, osd, mds, rgw).
+    # v18 is Reef, v19 is Squid
+    # RECOMMENDATION: In production, use a specific version tag instead of the general v18 flag, which pulls the latest release and could result in different
+    # versions running within the cluster. See tags available at https://hub.docker.com/r/ceph/ceph/tags/.
+    # If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v19.2.3-20250717
+    # This tag might not contain a new Ceph version, just security fixes from the underlying operating system, which will reduce vulnerabilities
+    image: quay.io/ceph/ceph:v19.2.3
+    # Whether to allow unsupported versions of Ceph. Currently Reef and Squid are supported.
+    # Future versions such as Tentacle (v20) would require this to be set to `true`.
+    # Do not set to true in production.
+    allowUnsupported: false
 
   # The path on the host where configuration files will be persisted. Must be specified. If there are multiple clusters, the directory must be unique for each cluster.
   # Important: if you reinstall the cluster, make sure you delete this directory from each host or else the mons will fail to start on the new cluster.