diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml index 3ff39968b4..84a21ffa16 100644 --- a/installer/roles/kubernetes/tasks/main.yml +++ b/installer/roles/kubernetes/tasks/main.yml @@ -214,6 +214,7 @@ - 'deployment' - 'supervisor' - 'launch_awx' + - 'rsyslog' no_log: true - name: Apply Deployment @@ -225,6 +226,7 @@ - "{{ deployment }}" - "{{ supervisor }}" - "{{ launch_awx }}" + - "{{ rsyslog }}" no_log: true - name: Delete any existing management pod diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index 8e3c1f2a01..080a2ae80a 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/installer/roles/kubernetes/templates/deployment.yml.j2 @@ -98,7 +98,7 @@ spec: mountPath: "/var/run/supervisor" - name: rsyslog-socket mountPath: "/var/run/rsyslog" - - name: rsyslog-config + - name: rsyslog-dir mountPath: "/var/lib/awx/rsyslog/" {% if ca_trust_dir is defined %} - name: {{ kubernetes_deployment_name }}-ca-trust-dir @@ -148,6 +148,11 @@ spec: subPath: supervisor_task.conf readOnly: true + - name: {{ kubernetes_deployment_name }}-rsyslog-config + mountPath: "/var/lib/awx/rsyslog/rsyslog.conf" + subPath: rsyslog.conf + readOnly: true + - name: {{ kubernetes_deployment_name }}-secret-key mountPath: "/etc/tower/SECRET_KEY" subPath: SECRET_KEY @@ -184,7 +189,7 @@ spec: mountPath: "/var/run/supervisor" - name: rsyslog-socket mountPath: "/var/run/rsyslog" - - name: rsyslog-config + - name: rsyslog-dir mountPath: "/var/lib/awx/rsyslog/" {% if ca_trust_dir is defined %} - name: {{ kubernetes_deployment_name }}-ca-trust-dir @@ -331,7 +336,7 @@ spec: emptyDir: {} - name: rsyslog-socket emptyDir: {} - - name: rsyslog-config + - name: rsyslog-dir emptyDir: {} {% if ca_trust_dir is defined %} - name: {{ kubernetes_deployment_name }}-ca-trust-dir @@ -409,6 +414,12 @@ spec: - key: supervisor-task-config path: 'supervisor_task.conf' + - name: {{ kubernetes_deployment_name }}-rsyslog-config + configMap: + name: {{ kubernetes_deployment_name }}-rsyslog-config + items: + - key: rsyslog-config + path: 'rsyslog.conf' - name: {{ kubernetes_deployment_name }}-secret-key secret: diff --git a/installer/roles/kubernetes/templates/rsyslog.yml.j2 b/installer/roles/kubernetes/templates/rsyslog.yml.j2 new file mode 100644 index 0000000000..3055c498ea --- /dev/null +++ b/installer/roles/kubernetes/templates/rsyslog.yml.j2 @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ kubernetes_deployment_name }}-rsyslog-config + namespace: {{ kubernetes_namespace }} +data: + rsyslog-config: | + $WorkDirectory /var/lib/awx/rsyslog + $IncludeConfig /etc/rsyslog.d/*.conf +