Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[DMAAP] DMaaP ServiceMesh compatibility"
[oom.git]
/
kubernetes
/
contrib
/
components
/
awx
/
templates
/
statefulset.yaml
diff --git
a/kubernetes/contrib/components/awx/templates/statefulset.yaml
b/kubernetes/contrib/components/awx/templates/statefulset.yaml
index
46747cd
..
1f2c093
100644
(file)
--- a/
kubernetes/contrib/components/awx/templates/statefulset.yaml
+++ b/
kubernetes/contrib/components/awx/templates/statefulset.yaml
@@
-82,6
+82,10
@@
spec:
name: awx-secret-key
readOnly: true
subPath: SECRET_KEY
name: awx-secret-key
readOnly: true
subPath: SECRET_KEY
+ - mountPath: /etc/nginx/nginx.conf
+ name: awx-nginx-conf
+ subPath: "nginx.conf"
+
- command: ["/bin/sh","-c"]
args: ["/usr/bin/launch_awx_task.sh"]
env:
- command: ["/bin/sh","-c"]
args: ["/usr/bin/launch_awx_task.sh"]
env:
@@
-109,6
+113,9
@@
spec:
name: awx-secret-key
readOnly: true
subPath: SECRET_KEY
name: awx-secret-key
readOnly: true
subPath: SECRET_KEY
+ - mountPath: /etc/nginx/nginx.conf
+ name: awx-nginx-conf
+ subPath: "nginx.conf"
- env:
- name: MY_POD_IP
valueFrom:
- env:
- name: MY_POD_IP
valueFrom:
@@
-209,5
+216,12
@@
spec:
path: rabbitmq_definitions.json
name: {{ include "common.fullname" . }}-rabbitmq
name: rabbitmq-config
path: rabbitmq_definitions.json
name: {{ include "common.fullname" . }}-rabbitmq
name: rabbitmq-config
+ - configMap:
+ defaultMode: 420
+ items:
+ - key: nginx.conf
+ path: nginx.conf
+ name: {{ include "common.fullname" . }}-nginx-conf
+ name: awx-nginx-conf
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"