External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove references to old images

Browse Source
This commit is contained in:
Shane McDonald
2020-07-01 14:57:48 -04:00
parent 7f81f530fa
commit e26387cdf3
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,11 +8,8 @@ admin_password: ''
kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config" kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config"
kubernetes_task_version: "{{ tower_package_version | default(dockerhub_version) }}" kubernetes_awx_version: "{{ dockerhub_version }}"
kubernetes_web_version: "{{ tower_package_version | default(dockerhub_version) }}" kubernetes_awx_image: "ansible/awx"
kubernetes_awx_image: "{{ tower_package_name | default('ansible/awx') }}"
kubernetes_web_image: "{{ kubernetes_awx_image }}"
kubernetes_task_image: "{{ kubernetes_awx_image }}"
awx_psp_create: false awx_psp_create: false
awx_psp_name: 'awx' awx_psp_name: 'awx'

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

@@ -161,7 +161,7 @@ spec:
privileged: {{ web_security_context_privileged }} privileged: {{ web_security_context_privileged }}
{% endif %} {% endif %}
{% endif %} {% endif %}
image: "{{ kubernetes_awx_image }}:{{ kubernetes_web_version }}" image: "{{ kubernetes_awx_image }}:{{ kubernetes_awx_version }}"
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8052 - containerPort: 8052
@@ -253,7 +253,7 @@ spec:
privileged: {{ task_security_context_privileged }} privileged: {{ task_security_context_privileged }}
{% endif %} {% endif %}
{% endif %} {% endif %}
image: "{{ kubernetes_task_image }}:{{ kubernetes_task_version }}" image: "{{ kubernetes_awx_image }}:{{ kubernetes_awx_version }}"
command: command:
- /usr/bin/launch_awx_task.sh - /usr/bin/launch_awx_task.sh
imagePullPolicy: Always imagePullPolicy: Always

2
installer/roles/kubernetes/templates/management-pod.yml.j2
View File

@@ -11,7 +11,7 @@ spec:
{% endif %} {% endif %}
containers: containers:
- name: ansible-tower-management - name: ansible-tower-management
image: "{{ kubernetes_task_image }}:{{ kubernetes_task_version }}" image: "{{ kubernetes_awx_image }}:{{ kubernetes_awx_version }}"
imagePullPolicy: Always imagePullPolicy: Always
command: ["sleep", "infinity"] command: ["sleep", "infinity"]
volumeMounts: volumeMounts: