diff --git a/roles/installer/templates/deployments/task.yaml.j2 b/roles/installer/templates/deployments/task.yaml.j2 index 5d28a3e5..6af21d77 100644 --- a/roles/installer/templates/deployments/task.yaml.j2 +++ b/roles/installer/templates/deployments/task.yaml.j2 @@ -157,108 +157,6 @@ spec: /var/lib/pre-stop/scripts/termination-waiter {% endif %} resources: {{ redis_resource_requirements }} - - image: '{{ _image }}' - name: '{{ ansible_operator_meta.name }}-web' -{% if web_command %} - command: {{ web_command }} -{% endif %} -{% if web_args %} - args: {{ web_args }} -{% endif %} - imagePullPolicy: '{{ image_pull_policy }}' - ports: - - containerPort: 8052 -{% if ingress_type | lower == 'route' and route_tls_termination_mechanism | lower == 'passthrough' %} - - containerPort: 8053 -{% endif %} - volumeMounts: -{% if bundle_ca_crt %} - - name: "ca-trust-extracted" - mountPath: "/etc/pki/ca-trust/extracted" - - name: "{{ ansible_operator_meta.name }}-bundle-cacert" - mountPath: /etc/pki/ca-trust/source/anchors/bundle-ca.crt - subPath: bundle-ca.crt - readOnly: true -{% endif %} - - name: "{{ ansible_operator_meta.name }}-application-credentials" - mountPath: "/etc/tower/conf.d/execution_environments.py" - subPath: execution_environments.py - readOnly: true - - name: "{{ ansible_operator_meta.name }}-application-credentials" - mountPath: "/etc/tower/conf.d/credentials.py" - subPath: credentials.py - readOnly: true - - name: "{{ ansible_operator_meta.name }}-application-credentials" - mountPath: "/etc/tower/conf.d/ldap.py" - subPath: ldap.py - readOnly: true -{% if ingress_type | lower == 'route' and route_tls_termination_mechanism | lower == 'passthrough' %} - - name: "{{ ansible_operator_meta.name }}-nginx-certs" - mountPath: "/etc/nginx/pki" - readOnly: true -{% endif %} -{% if ldap_cacert_ca_crt %} - - name: "{{ ansible_operator_meta.name }}-ldap-cacert" - mountPath: /etc/openldap/certs/ldap-ca.crt - subPath: ldap-ca.crt - readOnly: true -{% endif %} - - name: "{{ secret_key_secret_name }}" - mountPath: /etc/tower/SECRET_KEY - subPath: SECRET_KEY - readOnly: true - - name: {{ ansible_operator_meta.name }}-settings - mountPath: /etc/tower/settings.py - subPath: settings.py - readOnly: true - - name: {{ ansible_operator_meta.name }}-nginx-conf - mountPath: /etc/nginx/nginx.conf - subPath: nginx.conf - readOnly: true - - name: {{ ansible_operator_meta.name }}-redis-socket - mountPath: "/var/run/redis" - - name: supervisor-socket - mountPath: "/var/run/supervisor" - - name: rsyslog-socket - mountPath: "/var/run/awx-rsyslog" - - name: rsyslog-dir - mountPath: "/var/lib/awx/rsyslog" - - name: "{{ ansible_operator_meta.name }}-projects" - mountPath: "/var/lib/awx/projects" - - name: "{{ ansible_operator_meta.name }}-receptor-work-signing" - mountPath: "/etc/receptor/signing/work-public-key.pem" - subPath: "work-public-key.pem" - readOnly: true - - name: "{{ ansible_operator_meta.name }}-receptor-ca" - mountPath: "/etc/receptor/tls/ca/receptor-ca.crt" - subPath: "tls.crt" - readOnly: true - - name: "{{ ansible_operator_meta.name }}-receptor-ca" - mountPath: "/etc/receptor/tls/ca/receptor-ca.key" - subPath: "tls.key" - readOnly: true -{% if development_mode | bool %} - - name: awx-devel - mountPath: "/awx_devel" -{% endif %} -{% if web_extra_volume_mounts -%} - {{ web_extra_volume_mounts | indent(width=12, first=True) }} -{% endif %} - env: - - name: MY_POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: UWSGI_MOUNT_PATH - value: "{{ ingress_path }}" -{% if development_mode | bool %} - - name: AWX_KUBE_DEVEL - value: "1" -{% endif %} -{% if web_extra_env -%} - {{ web_extra_env | indent(width=12, first=True) }} -{% endif %} - resources: {{ web_resource_requirements }} - image: '{{ _image }}' name: '{{ ansible_operator_meta.name }}-task' imagePullPolicy: '{{ image_pull_policy }}'