openstack
/
openstack-helm-infra
Code Issues Proposed changes

Fix service account name for ceph-mon keyring generator 

Fix issues introduced by https://review.opendev.org/#/c/735648
with extra 'ceph-' in service_account and security context not
rendered for keyring generator containers.

Change-Id: Ie53b3407dbd7345d37c92c60a04f3badf735f6a6
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko 2020-07-07 15:06:23 -05:00
parent 824f168efc
commit 41f02d3c98
No known key found for this signature in database
GPG Key ID: F3E83668DBB223B3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph-mon/templates/job-keyring.yaml
View File

@ -18,7 +18,7 @@ limitations under the License.
{{- $component := print $cephBootstrapKey "-keyring-generator" }}
{{- $jobName := print "ceph-" $component }}
{{- $serviceAccountName := print "ceph-" $jobName }}
{{- $serviceAccountName := $jobName }}
{{ tuple $envAll "job_keyring_generator" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: rbac.authorization.k8s.io/v1
@ -71,7 +71,7 @@ spec:
- name: {{ $jobName }}
{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "ceph" "container" "$jobName" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
{{ dict "envAll" $envAll "application" "ceph" "container" $jobName | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
env:
- name: DEPLOYMENT_NAMESPACE
valueFrom: