Merge "Rename mariadb backup identities"

mariadb/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.1.9
+version: 0.1.10
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:

mariadb/templates/cron-job-backup-mariadb.yaml

@@ -97,7 +97,7 @@ spec:
                   value: {{ .Values.conf.backup.remote_backup.container_name | quote }}
                 - name: STORAGE_POLICY
                   value: "{{ .Values.conf.backup.remote_backup.storage_policy }}"
-{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.remote_rgw_user }}
+{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.mariadb }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 16 }}
 {{- end }}
 {{- end }}

mariadb/templates/secret-rgw.yaml

@@ -13,11 +13,11 @@ limitations under the License.
 
 
 This manifest results in two secrets being created:
-  1) Keystone "remote_rgw_user" secret, which is needed to access the cluster
+  1) Keystone "mariadb" secret, which is needed to access the cluster
      (remote or same cluster) for storing mariadb backups. If the
      cluster is remote, the auth_url would be non-null.
-  2) Keystone "remote_ks_admin" secret, which is needed to create the
+  2) Keystone "admin" secret, which is needed to create the
-     "remote_rgw_user" keystone account mentioned above. This may not
+     "mariadb" keystone account mentioned above. This may not
      be needed if the account is in a remote cluster (auth_url is non-null
      in that case).
 */}}
@@ -25,7 +25,7 @@ This manifest results in two secrets being created:
 {{- if .Values.conf.backup.remote_backup.enabled }}
 
 {{- $envAll := . }}
-{{- $userClass := "remote_rgw_user" }}
+{{- $userClass := "mariadb" }}
 {{- $secretName := index $envAll.Values.secrets.identity $userClass }}
 ---
 apiVersion: v1
@@ -50,7 +50,7 @@ data:
   OS_DEFAULT_DOMAIN: {{ $identityClass.default_domain_id | default "default" | b64enc }}
 ...
 {{- if .Values.manifests.job_ks_user }}
-{{- $userClass := "remote_ks_admin" }}
+{{- $userClass := "admin" }}
 {{- $secretName := index $envAll.Values.secrets.identity $userClass }}
 ---
 apiVersion: v1

mariadb/values.yaml

@@ -466,8 +466,8 @@ monitoring:
 
 secrets:
   identity:
-    remote_ks_admin: keystone-admin-user
+    admin: keystone-admin-user
-    remote_rgw_user: mariadb-backup-user
+    mariadb: mariadb-backup-user
   mariadb:
     backup_restore: mariadb-backup-restore
   tls:
@@ -571,7 +571,7 @@ endpoints:
     name: backup-storage-auth
     namespace: openstack
     auth:
-      remote_ks_admin:
+      admin:
         # Auth URL of null indicates local authentication
         # HTK will form the URL unless specified here
         auth_url: null
@@ -581,7 +581,7 @@ endpoints:
         project_name: admin
         user_domain_name: default
         project_domain_name: default
-      remote_rgw_user:
+      mariadb:
         # Auth URL of null indicates local authentication
         # HTK will form the URL unless specified here
         auth_url: null

releasenotes/notes/mariadb.yaml

@@ -10,4 +10,5 @@ mariadb:
   - 0.1.7 Revert - Change Issuer to ClusterIssuer
   - 0.1.8 Change Issuer to ClusterIssuer with logic in place to support cert-manager versioning
   - 0.1.9 Uplift Mariadb-ingress to 0.42.0
+  - 0.1.10 Rename mariadb backup identities
 ...