diff options
| -rw-r--r-- | kubernetes/sdc/templates/sdc-be.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/templates/sdc-cs.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/templates/sdc-es.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/templates/sdc-fe.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/templates/sdc-kb.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/templates/sdc-pv-pvc.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/values.yaml | 1 |
7 files changed, 10 insertions, 9 deletions
diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml index 6485aa1983..3b72071099 100644 --- a/kubernetes/sdc/templates/sdc-be.yaml +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -107,7 +107,7 @@ spec: name : sdc-log-be-configmap - name: sdc-sdc-es-es hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-es/ES - name: sdc-environments configMap: name: sdc-environments-configmap @@ -117,7 +117,7 @@ spec: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml index d70ead4407..32aba467b3 100644 --- a/kubernetes/sdc/templates/sdc-cs.yaml +++ b/kubernetes/sdc/templates/sdc-cs.yaml @@ -75,7 +75,7 @@ spec: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml index 3f2ef332b1..1a2f70d77e 100644 --- a/kubernetes/sdc/templates/sdc-es.yaml +++ b/kubernetes/sdc/templates/sdc-es.yaml @@ -71,7 +71,7 @@ spec: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml index b4205ed653..d1144d999e 100644 --- a/kubernetes/sdc/templates/sdc-fe.yaml +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -101,7 +101,7 @@ spec: name : sdc-log-fe-configmap - name: sdc-sdc-es-es hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-es/ES - name: sdc-environments configMap: name: sdc-environments-configmap @@ -111,7 +111,7 @@ spec: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs - name: sdc-fe-config configMap: name: sdc-fe-configmap diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml index 658f6c1a03..a0a00a0d39 100644 --- a/kubernetes/sdc/templates/sdc-kb.yaml +++ b/kubernetes/sdc/templates/sdc-kb.yaml @@ -67,7 +67,7 @@ spec: path: /etc/localtime - name: sdc-logs hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml index c8ce9531c2..254e55132b 100644 --- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml +++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml @@ -13,7 +13,7 @@ spec: - ReadWriteMany persistentVolumeReclaimPolicy: Retain hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-cs/CS --- kind: PersistentVolumeClaim apiVersion: v1 @@ -29,4 +29,4 @@ spec: selector: matchLabels: name: "{{ .Values.nsPrefix }}-sdc-cs-db" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml index 0ed76269ea..d42abcccbe 100644 --- a/kubernetes/sdc/values.yaml +++ b/kubernetes/sdc/values.yaml @@ -1,6 +1,7 @@ nsPrefix: onap pullPolicy: Always nodePortPrefix: 302 +dataRootDir: /dockerdata-nfs image: readiness: oomk8s/readiness-check:1.1.0 sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:v1.1.0 |