[ceph-mgr] Prevents repeated creation of ceph-mgr service account

Under some circumstances, armada job attempts to recreate an existing
Service Account for ceph-mgr. This patchset aims to remediate the issue.

Change-Id: I69bb9045c0e2f24dc2fa9e94ab6a09a58221e1f5
This commit is contained in:
Sigunov, Vladimir (vs422h) 2022-03-16 13:27:53 -04:00
parent 3a10c5ba95
commit 81179cb2e3
4 changed files with 8 additions and 1 deletions

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Ceph Mon
name: ceph-mon
version: 0.1.23
version: 0.1.24
home: https://github.com/ceph/ceph
...

View File

@ -16,7 +16,12 @@ limitations under the License.
{{- $envAll := . }}
{{- $serviceAccountName := "ceph-mgr" }}
# This protective IF prevents an attempt of repeated creation
# of ceph-mgr service account.
# To be considered: the separation of SA and Deployment manifests.
{{- if .Values.manifests.deployment_mgr_sa }}
{{ tuple $envAll "mgr" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- end }}
---
kind: Deployment
apiVersion: apps/v1

View File

@ -458,6 +458,7 @@ manifests:
configmap_templates: true
daemonset_mon: true
deployment_mgr: true
deployment_mgr_sa: true
deployment_moncheck: true
job_image_repo_sync: true
job_bootstrap: true

View File

@ -24,4 +24,5 @@ ceph-mon:
- 0.1.21 Change configmap names to be based on release name
- 0.1.22 Correct configmap names for all resources
- 0.1.23 Release-specific ceph-template configmap name
- 0.1.24 Prevents mgr SA from repeated creation
...