From f33226fa3f31db212471ad563b29e03d11089a6b Mon Sep 17 00:00:00 2001 From: bravof Date: Tue, 7 Jul 2020 16:50:33 -0400 Subject: [PATCH 1/2] fix(generator.yml): new strategy to get rid of that file --- .../charts/snmpexporter/templates/deployment.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml index 535a8be4..1d949b8e 100644 --- a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml @@ -37,18 +37,13 @@ spec: mountPath: /etc/snmp_exporter - name: internal-comm mountPath: /etc/internalcomm - startupProbe: - exec: - command: - - /bin/sh - - -c - - if [ -f "/etc/snmp_exporter/generator.yml" ]; then touch /etc/internalcomm/ok.init; fi livenessProbe: exec: command: - /bin/sh - -c - - if [ ! -f "/etc/snmp_exporter/generator.yml" ] || [ -f "/etc/internalcomm/ok.init" ]; then exit 0; else exit 1; fi + - if [ ! -f "/etc/snmp_exporter/generator.yml" ]; then exit 0; else rm -f /etc/snmp_exporter/generator.yml && exit 1; fi + failureThreshold: 1 resources: {{- toYaml .Values.resources | nindent 12 }} volumes: @@ -58,6 +53,4 @@ spec: - name: init-config-volume configMap: name: snmp-init-config - - name: internal-comm - emptyDir: {} \ No newline at end of file -- GitLab From aeb97dabf581663dd7b575bf13298c6749d9a2f7 Mon Sep 17 00:00:00 2001 From: bravof Date: Tue, 7 Jul 2020 16:58:15 -0400 Subject: [PATCH 2/2] fix(generator.yml): new strategy to get rid of that file --- .../eechart/charts/snmpexporter/templates/deployment.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml index 1d949b8e..e3f290e3 100644 --- a/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/charts/snmpexporter/templates/deployment.yaml @@ -35,8 +35,6 @@ spec: volumeMounts: - name: config-volume mountPath: /etc/snmp_exporter - - name: internal-comm - mountPath: /etc/internalcomm livenessProbe: exec: command: -- GitLab