Revert "[ceph] prepare upgrade to rook v1.16"

system/cc-ceph/Chart.lock

@@ -4,9 +4,9 @@ dependencies:
   version: 1.0.0
 - name: rook-ceph
   repository: https://charts.rook.io/release
-  version: v1.16.0
+  version: v1.15.0
 - name: rook-crds
   repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
-  version: 0.0.2-rook.1.16.0
-digest: sha256:d9a8ec1509dcec3a634aada46cbf9434897bfa7bf85bad9adb8c6af157aa08d4
-generated: "2024-12-18T11:34:58.26072907+01:00"
+  version: 0.0.2-rook.1.15.0
+digest: sha256:d8d894ba706ae4a8216ecf28bb9561fafc3b88908f183ba0b6d4b77f296e92f8
+generated: "2024-09-12T10:38:14.973622-04:00"

system/cc-ceph/Chart.yaml

@@ -2,16 +2,16 @@ apiVersion: v2
 name: cc-ceph
 description: A Helm chart for the Rook / Ceph Objects inside the Storage Clusters
 type: application
-version: 1.1.2
-appVersion: "1.16.0"
+version: 1.1.1
+appVersion: "1.15.0"
 dependencies:
   - name: owner-info
     repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
     version: '>= 0.0.0'
   - name: rook-ceph
     # version update should be done in the rook-crds chart as well
     repository: https://charts.rook.io/release
-    version: 1.16.0
+    version: 1.15.0
   - name: rook-crds
     repository: oci://keppel.eu-de-1.cloud.sap/ccloud-helm
-    version: '0.0.2-rook.1.16.0'
+    version: '0.0.2-rook.1.15.0'

system/cc-ceph/templates/cephobjectstore-placement-pools.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.rgwTargetPlacements.enabled }}
 {{- range $target := .Values.rgwTargetPlacements.placements }}
 ---
 apiVersion: ceph.rook.io/v1
@@ -79,6 +80,7 @@ spec:
     nodelete: {{ $.Values.pool.nodelete | quote }}
     nosizechange: {{ $.Values.pool.nosizechange | quote }}
 {{- end }}
+{{- end }}
 {{- if .Values.rgwTargetPlacements.premiumPlacements }}
 {{- range $target := .Values.rgwTargetPlacements.premiumPlacements }}
 ---

system/cc-ceph/templates/cephobjectstore.yaml

@@ -4,23 +4,8 @@ metadata:
   name: {{ .Values.objectstore.name }}
   namespace: {{ .Release.Namespace }}
 spec:
-{{- if .Values.objectstore.multiInstance.enabled }}
-  zone:
-    name: {{ .Values.objectstore.name }} 
-{{- else if and .Values.rgwTargetPlacements.useRookCRD .Values.rgwTargetPlacements.placements }}
-  sharedPools:
-    poolPlacements:
-{{- range $target := .Values.rgwTargetPlacements.placements }}
-      - name: {{ $target.name }} 
-        metadataPoolName: {{ $target.name }}.rgw.buckets.index
-        dataPoolName: {{ $target.name }}.rgw.buckets.data
-        dataNonECPoolName: {{ $target.name }}.rgw.buckets.non-ec
-        default: {{ $target.default | default false }}
-{{- end }}
-{{- else }}
   metadataPool: {{ toYaml .Values.objectstore.metadataPool | nindent 4 }}
   dataPool: {{ toYaml .Values.objectstore.dataPool | nindent 4 }}
-{{- end }}
   hosting:
 {{- if gt (len .Values.objectstore.gateway.dnsNames) 0 }}
     advertiseEndpoint:
@@ -75,9 +60,6 @@ spec:
       tokenCacheSize: {{ .token_cache_size }}
       url: {{ .url }}
   protocols:
-{{- if $.Values.objectstore.enabledAPIs }}
-    enableAPIs: {{ toYaml $.Values.objectstore.enabledAPIs | nindent 6 }}
-{{- end }}
     s3:
       authUseKeystone: true
     swift:

system/cc-ceph/values.yaml

@@ -90,7 +90,6 @@ dashboard:
 objectstore:
   enabled: true
   name: objectstore
-  enabledAPIs: [] # empty - all enabled. See: https://docs.ceph.com/en/reef/radosgw/config-ref/#confval-rgw_enable_apis
   gateway:
     instances: 6
     port: 80
@@ -150,30 +149,6 @@ objectstore:
       password: XXX
       domain: XXX
       project: XXX
-  multiInstance:
-    enabled: false
-    extraInstances:
-      # can inherit/override all config options from objectstore:
-    # - name: objectstore-admin
-    #   gateway:
-    #     instances: 2
-    #     sslCertificateRef: ""
-    #     dnsNames: 
-    #     - dns1-adm
-    #     - dns2-adm
-    #     resources:
-    #       requests:
-    #         cpu: 1
-    #         memory: 2Gi
-    #   service:
-    #     name: ceph-objectstore-admin-external
-    #     port: 443
-    #     externalIP: "10.0.0.1"
-    #     selector:
-    #       app: rgw
-    # define other RGW instances here:
-    # - name: other-instance-name
-
   prysm:
     enabled: true
     repository:
@@ -183,8 +158,7 @@ objectstore:
     interval: "10"
 
 rgwTargetPlacements:
-  #  enabled: false deprecate rgwTargetPlacements.enabled because it is true on all envs
-  useRookCRD: false # !!!WARNING set 'true' only for new clusters. Upgrade will not work now.
+  enabled: false
 
 defaultRgwPools:
   enabled: false # create default rgw pools, see: https://github.com/sapcc/helm-charts/issues/6670