diff options
Diffstat (limited to 'kubernetes')
| -rwxr-xr-x | kubernetes/config/docker/init/config-init.sh | 1 | ||||
| -rwxr-xr-x | kubernetes/oneclick/deleteAll.bash | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/templates/sdc-es.yaml | 7 |
3 files changed, 4 insertions, 8 deletions
diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh index 90e96b3946..e551b6deaa 100755 --- a/kubernetes/config/docker/init/config-init.sh +++ b/kubernetes/config/docker/init/config-init.sh @@ -33,7 +33,6 @@ mkdir -p /config-init/$NAMESPACE/portal/logs/ mkdir -p /config-init/$NAMESPACE/sdnc/data/ mkdir -p /config-init/$NAMESPACE/vid/mariadb/data/ mkdir -p /config-init/$NAMESPACE/sdc/sdc-cs/CS/ -mkdir -p /config-init/$NAMESPACE/sdc/sdc-es/ES/ mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-ES/ mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-CS/ mkdir -p /config-init/$NAMESPACE/sdc/logs/ASDC/ASDC-KB/ diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index cf293e48ad..b41679b061 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -94,7 +94,6 @@ fi printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n" - for i in ${HELM_APPS[@]}; do delete_app_helm $NS $i @@ -103,6 +102,9 @@ for i in ${HELM_APPS[@]}; do done +delete_app_helm $NS "config" +kubectl delete namespace $NS + if $WAIT_TERMINATE; then wait_terminate $NS fi diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml index aff280d838..1d2ba4805b 100644 --- a/kubernetes/sdc/templates/sdc-es.yaml +++ b/kubernetes/sdc/templates/sdc-es.yaml @@ -30,8 +30,6 @@ spec: - name: ES_HEAP_SIZE value: "1024M" volumeMounts: - - mountPath: /usr/share/elasticsearch/data/ - name: sdc-sdc-es-es - mountPath: /root/chef-solo/environments/ name: sdc-environments - mountPath: /etc/localtime @@ -48,9 +46,6 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 volumes: - - name: sdc-sdc-es-es - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES - name: sdc-environments hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments @@ -62,4 +57,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} |