diff --git a/installer/roles/kubernetes/defaults/main.yml b/installer/roles/kubernetes/defaults/main.yml index d8d2c862a9..754ff86fe0 100644 --- a/installer/roles/kubernetes/defaults/main.yml +++ b/installer/roles/kubernetes/defaults/main.yml @@ -40,6 +40,7 @@ openshift_pg_emptydir: false openshift_pg_pvc_name: postgresql kubernetes_deployment_name: awx +kubernetes_serviceaccount_name: awx kubernetes_deployment_replica_size: 1 diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index 682c61322b..da0dc9c794 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/installer/roles/kubernetes/templates/deployment.yml.j2 @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: awx + name: {{ kubernetes_serviceaccount_name }} namespace: {{ kubernetes_namespace }} {% if kubernetes_service_account_annotations is defined %} annotations: @@ -75,7 +75,7 @@ roleRef: name: {{ awx_psp_name }}-role subjects: - kind: ServiceAccount - name: awx + name: {{ kubernetes_serviceaccount_name }} namespace: {{ kubernetes_namespace }} {% endif %} @@ -103,7 +103,7 @@ spec: service: django app: {{ kubernetes_deployment_name }} spec: - serviceAccountName: awx + serviceAccountName: {{ kubernetes_serviceaccount_name }} securityContext: fsGroup: 0 terminationGracePeriodSeconds: 10