External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 14:09:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8138 from moreiramarti/devel

Browse Source 
K8s ServiceAccount variabilization

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-09-15 14:35:08 +00:00
committed by GitHub
parent 22bff7adec 8d5914b3f1
commit b0875965db
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/roles/kubernetes/defaults/main.yml
View File

@@ -40,6 +40,7 @@ openshift_pg_emptydir: false
openshift_pg_pvc_name: postgresql openshift_pg_pvc_name: postgresql
kubernetes_deployment_name: awx kubernetes_deployment_name: awx
kubernetes_serviceaccount_name: awx
kubernetes_deployment_replica_size: 1 kubernetes_deployment_replica_size: 1

6
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@@ -2,7 +2,7 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: awx name: {{ kubernetes_serviceaccount_name }}
namespace: {{ kubernetes_namespace }} namespace: {{ kubernetes_namespace }}
{% if kubernetes_service_account_annotations is defined %} {% if kubernetes_service_account_annotations is defined %}
annotations: annotations:
@@ -75,7 +75,7 @@ roleRef:
name: {{ awx_psp_name }}-role name: {{ awx_psp_name }}-role
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: awx name: {{ kubernetes_serviceaccount_name }}
namespace: {{ kubernetes_namespace }} namespace: {{ kubernetes_namespace }}
{% endif %} {% endif %}
@@ -103,7 +103,7 @@ spec:
service: django service: django
app: {{ kubernetes_deployment_name }} app: {{ kubernetes_deployment_name }}
spec: spec:
serviceAccountName: awx serviceAccountName: {{ kubernetes_serviceaccount_name }}
securityContext: securityContext:
fsGroup: 0 fsGroup: 0
terminationGracePeriodSeconds: 10 terminationGracePeriodSeconds: 10