From 192d7e0a56d44917e3a5821cf3b52a6c89e294cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?p=C3=BDrus?= <kayrus@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:09:47 +0100
Subject: [PATCH] [ceph] remove keystoneCRD value (#7571)

---
 system/cc-ceph/Chart.yaml                        |  2 +-
 .../cc-ceph/templates/ceph-config-override.yaml  | 16 ----------------
 .../cc-ceph/templates/ceph-keystone-secret.yaml  |  2 +-
 system/cc-ceph/templates/cephobjectstore.yaml    |  2 +-
 system/cc-ceph/values.yaml                       |  1 -
 5 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/system/cc-ceph/Chart.yaml b/system/cc-ceph/Chart.yaml
index cefd899348..79568fb7d3 100644
--- a/system/cc-ceph/Chart.yaml
+++ b/system/cc-ceph/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cc-ceph
 description: A Helm chart for the Rook / Ceph Objects inside the Storage Clusters
 type: application
-version: 1.1.0
+version: 1.1.1
 appVersion: "1.15.0"
 dependencies:
   - name: owner-info
diff --git a/system/cc-ceph/templates/ceph-config-override.yaml b/system/cc-ceph/templates/ceph-config-override.yaml
index 0015b7affc..64f8dc0241 100644
--- a/system/cc-ceph/templates/ceph-config-override.yaml
+++ b/system/cc-ceph/templates/ceph-config-override.yaml
@@ -15,28 +15,12 @@ data:
 {{- end }}
     rgw s3 auth order = {{ join "," .auth_order }}
     rgw keystone verify ssl = {{ .verify_ssl }}
-{{- if not .keystoneCRD }}
-    rgw keystone api version = 3
-    rgw s3 auth use keystone = true
-    rgw keystone url = {{ .url }}
-    rgw keystone implicit tenants = {{ .implicit_tenants }}
-    rgw swift account in url = {{ .swift_account_in_url }}
-    rgw swift versioning enabled = {{ .swift_versioning_enabled }}
-    rgw keystone accepted roles = {{ join "," .accepted_roles }}
-{{- end }}
 {{- if .accepted_admin_roles }}
     rgw keystone accepted admin roles = {{ join "," .accepted_admin_roles }}
 {{- end }}
 {{- if .accepted_reader_roles }}
     rgw keystone accepted reader roles = {{ join "," .accepted_reader_roles }}
 {{- end }}
-{{- if not .keystoneCRD }}
-    rgw keystone token cache size = {{ .token_cache_size }}
-    rgw keystone admin user = {{ .admin_user }}
-    rgw keystone admin password = {{ include "cc-ceph.escapePassword" .admin_password }}
-    rgw keystone admin domain = {{ .admin_domain }}
-    rgw keystone admin project = {{ .admin_project }}
-{{- end }}
 {{- if and .barbican .barbican.enabled }}
     rgw crypt s3 kms backend = barbican
     rgw barbican url = {{ .barbican.url }}
diff --git a/system/cc-ceph/templates/ceph-keystone-secret.yaml b/system/cc-ceph/templates/ceph-keystone-secret.yaml
index 921ec39b94..e9efe52923 100644
--- a/system/cc-ceph/templates/ceph-keystone-secret.yaml
+++ b/system/cc-ceph/templates/ceph-keystone-secret.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.objectstore.keystone.enabled .Values.objectstore.keystone.keystoneCRD }}
+{{- if and .Values.objectstore.keystone.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/system/cc-ceph/templates/cephobjectstore.yaml b/system/cc-ceph/templates/cephobjectstore.yaml
index 5bb01ffbb3..a17a95da7c 100644
--- a/system/cc-ceph/templates/cephobjectstore.yaml
+++ b/system/cc-ceph/templates/cephobjectstore.yaml
@@ -47,7 +47,7 @@ spec:
     sslCertificateRef: {{ .Values.objectstore.gateway.sslCertificateRef }}
     resources: {{ toYaml .Values.objectstore.gateway.resources | nindent 6 }}
   preservePoolsOnDelete: true
-{{- if and .Values.objectstore.keystone.enabled .Values.objectstore.keystone.keystoneCRD }}
+{{- if and .Values.objectstore.keystone.enabled }}
 {{- with .Values.objectstore.keystone }}
   auth:
     keystone:
diff --git a/system/cc-ceph/values.yaml b/system/cc-ceph/values.yaml
index 05bec3371b..4fb53bd0a4 100644
--- a/system/cc-ceph/values.yaml
+++ b/system/cc-ceph/values.yaml
@@ -124,7 +124,6 @@ objectstore:
       - 10.0.0.1
   keystone:
     enabled: true
-    keystoneCRD: false
     global_config: true
     auth_order:
       - local