diff --git a/roles/openshift-apps/monitor-gating/templates/configmap.yml b/roles/openshift-apps/monitor-gating/templates/configmap.yml deleted file mode 100644 index bde8ee94a1..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/configmap.yml +++ /dev/null @@ -1,11 +0,0 @@ -{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: monitor-gating-configmap - labels: - app: monitor-gating -data: - runner.cfg: |- - {{ load_file('runner.cfg') | indent }} diff --git a/roles/openshift-apps/monitor-gating/templates/deploymentconfig.yml b/roles/openshift-apps/monitor-gating/templates/deploymentconfig.yml index 8682106b69..3abbf70732 100644 --- a/roles/openshift-apps/monitor-gating/templates/deploymentconfig.yml +++ b/roles/openshift-apps/monitor-gating/templates/deploymentconfig.yml @@ -23,9 +23,6 @@ spec: image: monitor-gating:latest resources: {} volumeMounts: - - name: config-volume - mountPath: /config/ - readOnly: true - name: monitor-gating-secret-volume mountPath: /config/app-config/ readOnly: true @@ -33,9 +30,6 @@ spec: mountPath: /root/.ssh/ readOnly: true volumes: - - name: config-volume - configMap: - name: monitor-gating-configmap - name: monitor-gating-secret-volume secret: secretName: monitor-gating-secret diff --git a/roles/openshift-apps/monitor-gating/templates/secret.yml b/roles/openshift-apps/monitor-gating/templates/secret.yml index c4bb464de5..1aea7c0e77 100644 --- a/roles/openshift-apps/monitor-gating/templates/secret.yml +++ b/roles/openshift-apps/monitor-gating/templates/secret.yml @@ -8,3 +8,6 @@ metadata: stringData: monitor_gating.cfg: |- {{ load_file('monitor_gating.cfg') | indent }} + runner.cfg: |- + {{ load_file('runner.cfg') | indent }} +