More configuration

This commit is contained in:
Matthew Jones
2020-05-29 16:46:42 -04:00
parent 4f160c6aef
commit 02efdee863
2 changed files with 47 additions and 20 deletions

View File

@@ -228,3 +228,8 @@ data:
} }
} }
} }
redis_conf: |
unixsocket /var/run/redis/redis.sock
unixsocketperm 777
port 0
bind 127.0.0.1

View File

@@ -31,38 +31,54 @@ spec:
containers: containers:
- name: memcached - name: memcached
image: '{{ tower_memcached_image }}' image: '{{ tower_memcached_image }}'
command:
- 'memcached'
- '-s'
- '/var/run/memcached/memcached.sock'
- '-a'
- '0666'
ports: ports:
- containerPort: 11211 - containerPort: 1121
volumeMounts:
- name: {{ meta.name }}-memcached-socket
mountPath: "/var/run/memcached"
- image: '{{ tower_redis_image }}' - image: '{{ tower_redis_image }}'
name: redis name: redis
ports: ports:
- containerPort: 6379 - containerPort: 6379
volumeMounts:
- name: {{ meta.name }}-redis-config
mountPath: "/usr/local/etc/redis/redis.conf"
subPath: redis.conf
readOnly: true
- name: {{ meta.name }}-redis-socket
mountPath: "/var/run/redis"
- image: '{{ tower_web_image }}' - image: '{{ tower_web_image }}'
name: tower name: tower
ports: ports:
- containerPort: 8052 - containerPort: 8052
volumeMounts: volumeMounts:
- name: secret-key - name: {{ meta.name }}-secret-key
mountPath: /etc/tower/SECRET_KEY mountPath: /etc/tower/SECRET_KEY
subPath: SECRET_KEY subPath: SECRET_KEY
readOnly: true readOnly: true
- name: environment - name: {{ meta.name }}-environment
mountPath: /etc/tower/conf.d/environment.sh mountPath: /etc/tower/conf.d/environment.sh
subPath: environment.sh subPath: environment.sh
readOnly: true readOnly: true
- name: settings - name: {{ meta.name }}-settings
mountPath: /etc/tower/settings.py mountPath: /etc/tower/settings.py
subPath: settings.py subPath: settings.py
readOnly: true readOnly: true
- name: nginx-conf - name: {{ meta.name }}-nginx-conf
mountPath: /etc/nginx/nginx.conf mountPath: /etc/nginx/nginx.conf
subPath: nginx.conf subPath: nginx.conf
readOnly: true readOnly: true
- name: launch-awx-web - name: {{ meta.name }}-launch-awx-web
mountPath: /usr/bin/launch_awx.sh mountPath: /usr/bin/launch_awx.sh
subPath: launch_awx.sh subPath: launch_awx.sh
readOnly: true readOnly: true
- name: supervisor-web-config - name: {{ meta.name }}-supervisor-web-config
mountPath: /supervisor.conf mountPath: /supervisor.conf
subPath: supervisor.conf subPath: supervisor.conf
readOnly: true readOnly: true
@@ -88,23 +104,23 @@ spec:
- secretRef: - secretRef:
name: '{{ meta.name }}-tower-secret' name: '{{ meta.name }}-tower-secret'
volumeMounts: volumeMounts:
- name: secret-key - name: {{ meta.name }}-secret-key
mountPath: /etc/tower/SECRET_KEY mountPath: /etc/tower/SECRET_KEY
subPath: SECRET_KEY subPath: SECRET_KEY
readOnly: true readOnly: true
- name: environment - name: {{ meta.name }}-environment
mountPath: /etc/tower/conf.d/environment.sh mountPath: /etc/tower/conf.d/environment.sh
subPath: environment.sh subPath: environment.sh
readOnly: true readOnly: true
- name: settings - name: {{ meta.name }}-settings
mountPath: /etc/tower/settings.py mountPath: /etc/tower/settings.py
subPath: settings.py subPath: settings.py
readOnly: true readOnly: true
- name: launch-awx-task - name: {{ meta.name }}-launch-awx-task
mountPath: /usr/bin/launch_awx_task.sh mountPath: /usr/bin/launch_awx_task.sh
subPath: launch_awx_task.sh subPath: launch_awx_task.sh
readOnly: true readOnly: true
- name: supervisor-task-config - name: {{ meta.name }}-supervisor-task-config
mountPath: /supervisor_task.conf mountPath: /supervisor_task.conf
subPath: supervisor_task.conf subPath: supervisor_task.conf
readOnly: true readOnly: true
@@ -117,51 +133,57 @@ spec:
memory: '{{ tower_task_mem_request }}' memory: '{{ tower_task_mem_request }}'
cpu: '{{ tower_task_cpu_request }}' cpu: '{{ tower_task_cpu_request }}'
volumes: volumes:
- name: secret-key - name: {{ meta.name }}-secret-key
secret: secret:
secretName: '{{ meta.name }}-tower-secret' secretName: '{{ meta.name }}-tower-secret'
items: items:
- key: secret_key - key: secret_key
path: SECRET_KEY path: SECRET_KEY
- name: environment - name: {{ meta.name }}-environment
configMap: configMap:
name: '{{ meta.name }}-tower-configmap' name: '{{ meta.name }}-tower-configmap'
items: items:
- key: environment - key: environment
path: environment.sh path: environment.sh
- name: settings - name: {{ meta.name }}-settings
configMap: configMap:
name: '{{ meta.name }}-tower-configmap' name: '{{ meta.name }}-tower-configmap'
items: items:
- key: settings - key: settings
path: settings.py path: settings.py
- name: nginx-conf - name: {{ meta.name }}-nginx-conf
configMap: configMap:
name: '{{ meta.name }}-tower-configmap' name: '{{ meta.name }}-tower-configmap'
items: items:
- key: nginx_conf - key: nginx_conf
path: nginx.conf path: nginx.conf
- name: launch-awx-web - name: {{ meta.name }}-redis-config
configMap:
name: {{ meta.name }}-tower-configmap
items:
- key: redis_conf
path: redis.conf
- name: {{ meta.name }}-launch-awx-web
configMap: configMap:
name: '{{meta.name }}-launch-awx' name: '{{meta.name }}-launch-awx'
items: items:
- key: launch-awx-web - key: launch-awx-web
path: launch_awx.sh path: launch_awx.sh
defaultMode: 0755 defaultMode: 0755
- name: supervisor-web-config - name: {{ meta.name }}-supervisor-web-config
configMap: configMap:
name: '{{ meta.name }}-supervisor-config' name: '{{ meta.name }}-supervisor-config'
items: items:
- key: supervisor-web-config - key: supervisor-web-config
path: supervisor.conf path: supervisor.conf
- name: launch-awx-task - name: {{ meta.name }}-launch-awx-task
configMap: configMap:
name: '{{ meta.name }}-launch-awx' name: '{{ meta.name }}-launch-awx'
items: items:
- key: launch-awx-task - key: launch-awx-task
path: 'launch_awx_task.sh' path: 'launch_awx_task.sh'
defaultMode: 0755 defaultMode: 0755
- name: supervisor-task-config - name: {{ meta.name }}-supervisor-task-config
configMap: configMap:
name: '{{ meta.name }}-supervisor-config' name: '{{ meta.name }}-supervisor-config'
items: items: