X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdc%2Ftemplates%2Fsdc-kb.yaml;h=a0a00a0d3917a0c3bac4a0916fa3823ca41afcd0;hb=792775cf43d2badea5ab444891c8627ceabab659;hp=0d77e42d975adba3fb7adfd6e3042e2de8e7f74a;hpb=0fe0d89166b7f10f16fa698c2d29a3752a803593;p=oom.git

diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index 0d77e42d97..a0a00a0d39 100644
--- a/kubernetes/sdc/templates/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableSdcSdcKb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -14,35 +15,24 @@ spec:
       labels:
         app: sdc-kb
       name: sdc-kb
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "sdc-es",
-                  "--container-name",
-                  "sdc-cs"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "sdc-kb-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - sdc-es
+        - --container-name
+        - sdc-cs
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: sdc-kb-readiness
       containers:
       - env:
         - name: ENVNAME
@@ -69,13 +59,15 @@ spec:
           periodSeconds: 10
       volumes:
         - name: sdc-environments
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/environments
+          configMap:
+            name: sdc-environments-configmap
+            defaultMode: 0755
         - name: sdc-localtime
           hostPath:
             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 }}