Merge "Script_version addiition in robot config"

[oom.git] / kubernetes / log / templates / kibana-deployment.yaml

diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml
index e48cbb4..b60011a 100644 (file)
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-deployment.yaml
@@ -1,12 +1,27 @@
+# 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.disableLogKibana }}
 apiVersion: extensions/v1beta1 
 kind: Deployment
 metadata:
   labels:
     app: kibana
-  name: kibana
-  namespace: {{ .Values.nsPrefix }}-log
+  name: log-kibana
+  namespace: {{ .Values.nsPrefix }}
 spec:
+  replicas: {{ .Values.kibanaReplicas }}
   selector:
     matchLabels:
       app: kibana
@@ -14,34 +29,23 @@ spec:
     metadata:
       labels:
         app: kibana
-      name: kibana
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "elasticsearch"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "kibana-readiness"
-          }
-          ]'
+      name: log-kibana
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - elasticsearch
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: kibana-readiness
       containers:
       - name: kibana
         image: {{ .Values.image.kibana }}
@@ -58,7 +62,7 @@ spec:
       volumes:
         - name: kibana-conf
           configMap:
-            name: kibana-configmap
+            name: log-kibana-configmap
             items:
             - key: kibana.yml
               path: kibana.yml
@@ -66,8 +70,8 @@ spec:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: kibana-configmap
-  namespace: {{ .Values.nsPrefix }}-log
+  name: log-kibana-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig . | indent 2 }}
 #{{ end }}