Merge changes I6a379ec4,I982a75a9,Id8a84b79,I423294a5,Iefe3d89a

[oom.git] / kubernetes / aai / templates / hbase-deployment.yaml

diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml
index 598fc0f..62b017d 100644 (file)
--- a/kubernetes/aai/templates/hbase-deployment.yaml
+++ b/kubernetes/aai/templates/hbase-deployment.yaml
@@ -1,9 +1,25 @@
+# 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.disableAaiHbase }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: hbase
-  namespace: {{ .Values.NS }}
+  name: aai-hbase
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
+  replicas: {{ .Values.hbaseReplicas }}
   selector:
     matchLabels:
       app: hbase
@@ -11,19 +27,40 @@ spec:
     metadata:
       labels:
         app: hbase
-      name: hbase
+      name: aai-hbase
     spec:
       hostname: hbase
       containers:
       - name: hbase
-        image: {{ .Values.image.aaiHbase }}
+        image: "{{ .Values.image.aaiHbaseImage }}:{{ .Values.image.aaiHbaseVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
         ports:
-        - containerPort: 8020
+        - containerPort: 2181
+        - containerPort: 8080
+        - containerPort: 8085
+        - containerPort: 9090
+        - containerPort: 16000
+        - containerPort: 16010
+        - containerPort: 16201
         readinessProbe:
           tcpSocket:
-            port: 8020
+            port: 2181
           initialDelaySeconds: 5
           periodSeconds: 10
+        volumeMounts:
+        - name: hbase-data
+          mountPath: /tmp
+        - name: localtime
+          mountPath: /etc/localtime
+          readOnly: true
+      volumes:
+      - name: hbase-data
+        hostPath:
+          path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/hbase
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
+