diff --git a/installer/roles/kubernetes/defaults/main.yml b/installer/roles/kubernetes/defaults/main.yml index 0e7a9d55f9..b810b68103 100644 --- a/installer/roles/kubernetes/defaults/main.yml +++ b/installer/roles/kubernetes/defaults/main.yml @@ -8,11 +8,8 @@ admin_password: '' kubernetes_base_path: "{{ local_base_config_path|default('/tmp') }}/{{ kubernetes_deployment_name }}-config" -kubernetes_task_version: "{{ tower_package_version | default(dockerhub_version) }}" -kubernetes_web_version: "{{ tower_package_version | default(dockerhub_version) }}" -kubernetes_awx_image: "{{ tower_package_name | default('ansible/awx') }}" -kubernetes_web_image: "{{ kubernetes_awx_image }}" -kubernetes_task_image: "{{ kubernetes_awx_image }}" +kubernetes_awx_version: "{{ dockerhub_version }}" +kubernetes_awx_image: "ansible/awx" awx_psp_create: false awx_psp_name: 'awx' diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index a76b8c4954..36fedcdb45 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/installer/roles/kubernetes/templates/deployment.yml.j2 @@ -161,7 +161,7 @@ spec: privileged: {{ web_security_context_privileged }} {% endif %} {% endif %} - image: "{{ kubernetes_awx_image }}:{{ kubernetes_web_version }}" + image: "{{ kubernetes_awx_image }}:{{ kubernetes_awx_version }}" imagePullPolicy: Always ports: - containerPort: 8052 @@ -253,7 +253,7 @@ spec: privileged: {{ task_security_context_privileged }} {% endif %} {% endif %} - image: "{{ kubernetes_task_image }}:{{ kubernetes_task_version }}" + image: "{{ kubernetes_awx_image }}:{{ kubernetes_awx_version }}" command: - /usr/bin/launch_awx_task.sh imagePullPolicy: Always diff --git a/installer/roles/kubernetes/templates/management-pod.yml.j2 b/installer/roles/kubernetes/templates/management-pod.yml.j2 index 8576802a9b..6aec0b6706 100644 --- a/installer/roles/kubernetes/templates/management-pod.yml.j2 +++ b/installer/roles/kubernetes/templates/management-pod.yml.j2 @@ -11,7 +11,7 @@ spec: {% endif %} containers: - name: ansible-tower-management - image: "{{ kubernetes_task_image }}:{{ kubernetes_task_version }}" + image: "{{ kubernetes_awx_image }}:{{ kubernetes_awx_version }}" imagePullPolicy: Always command: ["sleep", "infinity"] volumeMounts: