External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 23:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Move secret key from configmap to secret

Browse Source
This commit is contained in:
Shane McDonald
2019-03-29 15:11:52 -04:00
parent 9479b1b824
commit 298eaa0b32
4 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,12 +142,19 @@ spec:
- containerPort: 8052
volumeMounts:
- name: {{ kubernetes_deployment_name }}-application-config
mountPath: "/etc/tower"
mountPath: "/etc/tower/settings.py"
subPath: settings.py
readOnly: true
- name: "{{ kubernetes_deployment_name }}-application-credentials"
mountPath: "/etc/tower/conf.d/"
readOnly: true
- name: {{ kubernetes_deployment_name }}-secret-key
mountPath: "/etc/tower/SECRET_KEY"
subPath: SECRET_KEY
readOnly: true
resources:
requests:
memory: "{{ web_mem_request }}Gi"
@@ -170,12 +177,21 @@ spec:
imagePullPolicy: Always
volumeMounts:
- name: {{ kubernetes_deployment_name }}-application-config
mountPath: "/etc/tower"
mountPath: "/etc/tower/settings.py"
subPath: settings.py
readOnly: true
- name: "{{ kubernetes_deployment_name }}-application-credentials"
mountPath: "/etc/tower/conf.d/"
readOnly: true
- name: {{ kubernetes_deployment_name }}-secret-key
mountPath: "/etc/tower/SECRET_KEY"
subPath: SECRET_KEY
readOnly: true
env:
- name: AWX_SKIP_MIGRATIONS
value: "1"
resources:
requests:
memory: "{{ task_mem_request }}Gi"
@@ -264,8 +280,6 @@ spec:
items:
- key: {{ kubernetes_deployment_name }}_settings
path: settings.py
- key: secret_key
path: SECRET_KEY
- name: "{{ kubernetes_deployment_name }}-application-credentials"
secret:
@@ -276,6 +290,13 @@ spec:
- key: environment_sh
path: 'environment.sh'
- name: {{ kubernetes_deployment_name }}-secret-key
secret:
secretName: "{{ kubernetes_deployment_name }}-secrets"
items:
- key: secret_key
path: SECRET_KEY
- name: rabbitmq-config
configMap:
name: rabbitmq-config