sdc K8S-Helm Parameterization

[oom.git] / kubernetes / sdc / templates / sdc-fe.yaml

diff --git a/kubernetes/sdc/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
similarity index 82%
rename from kubernetes/sdc/sdc-fe.yaml
rename to kubernetes/sdc/templates/sdc-fe.yaml
index 0711aa9..a566b15 100644 (file)
--- a/kubernetes/sdc/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
+  namespace: {{ .Values.NS }}
 spec:
   selector:
     matchLabels:
@@ -40,8 +41,8 @@ spec:
                       }
                   }
               ],
-              "image": "oomk8s/readiness-check:1.0.0",
-              "imagePullPolicy": "Always",
+              "image": "{{ .Values.image.readiness }}",
+              "imagePullPolicy": "{{ .Values.pullPolicy }}",
               "name": "sdc-fe-readiness"
           }
           ]'
@@ -55,7 +56,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest
+        image: {{ .Values.image.sdcFrontend }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
         volumeMounts:
         - mountPath: /usr/share/elasticsearch/data/
           name: sdc-sdc-es-es
@@ -80,21 +82,21 @@ spec:
       volumes:
         - name: sdc-sdc-es-es
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES
+            path: /dockerdata-nfs/onap/sdc/sdc-es/ES
         - name: sdc-environments
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/environments
+            path: /dockerdata-nfs/onap/sdc/environments
         - name: sdc-jetty-keystore
           hostPath:
-            path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore
+            path: /dockerdata-nfs/onap/sdc/jetty/keystore
         - name: sdc-localtime
           hostPath:
             path:  /etc/localtime
         - name:  sdc-logs
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/logs
+            path:  /dockerdata-nfs/onap/sdc/logs
         - name:  sdc-fe-config
           hostPath:
-            path:  /dockerdata-nfs/onapdemo/sdc/sdc-fe/FE_2_setup_configuration.rb
+            path:  /dockerdata-nfs/onap/sdc/sdc-fe/FE_2_setup_configuration.rb
       imagePullSecrets:
       - name: onap-docker-registry-key