External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 03:47:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove image push logic from installer roles

Browse Source 
I’m going to be reusing this code on the Tower side, and I’m trying to refactor some of the AWX specific bits out. There will probably be more to come, but this is a good start.
This commit is contained in:
Shane McDonald
2018-04-16 17:56:06 -04:00
parent 2b6fe7969f
commit 40d7751fbd
8 changed files with 74 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ spec:
serviceAccountName: rabbitmq
containers:
- name: {{ kubernetes_deployment_name }}-web
image: {{ web_kubernetes_image }}
image: {{ kubernetes_web_image | default(dockerhub_web_image) }}
imagePullPolicy: Always
ports:
- containerPort: 8052
@@ -143,7 +143,7 @@ spec:
memory: "{{ web_mem_request }}Gi"
cpu: "{{ web_cpu_request }}m"
- name: {{ kubernetes_deployment_name }}-celery
image: {{ task_kubernetes_image }}
image: {{ kubernetes_task_image | default(dockerhub_task_image) }}
imagePullPolicy: Always
volumeMounts:
- mountPath: /etc/tower
@@ -172,7 +172,7 @@ spec:
memory: "{{ task_mem_request }}Gi"
cpu: "{{ task_cpu_request }}m"
- name: {{ kubernetes_deployment_name }}-rabbit
image: {{ rabbitmq_image }}
image: "{{ kubernetes_rabbitmq_image }}:{{ kubernetes_rabbitmq_version }}"
imagePullPolicy: Always
ports:
- name: http
@@ -212,7 +212,7 @@ spec:
memory: "{{ rabbitmq_mem_request }}Gi"
cpu: "{{ rabbitmq_cpu_request }}m"
- name: {{ kubernetes_deployment_name }}-memcached
image: {{ memcached_image }}
image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
resources:
requests:
memory: "{{ memcached_mem_request }}Gi"