Merge "Fix MSB services be independent of release name"

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

diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index a7334d4..122781b 100644 (file)
--- a/kubernetes/sdc/templates/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -1,3 +1,17 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #{{ if not .Values.disableSdcSdcKb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -5,7 +19,7 @@ metadata:
   labels:
     app: sdc-kb
   name: sdc-kb
-  namespace: "{{ .Values.nsPrefix }}-sdc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -59,14 +73,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 }}