Persist AAI data add ns prefix

[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 5de7b98..3c1949c 100644 (file)
--- a/kubernetes/aai/templates/hbase-deployment.yaml
+++ b/kubernetes/aai/templates/hbase-deployment.yaml
@@ -1,8 +1,9 @@
+#{{ if not .Values.disableAaiHbase }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: hbase
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}-aai"
 spec:
   selector:
     matchLabels:
@@ -14,23 +15,36 @@ spec:
       name: hbase
     spec:
       hostname: hbase
-      volumes:
-        - name: hbase-opt-data
-          hostPath:
-            path: /dockerdata-nfs/onap/aai/hbase/opt/data
       containers:
       - name: hbase
-        image: {{ .Values.image.aaiHbase }}
+        image: "{{ .Values.image.aaiHbaseImage }}:{{ .Values.image.aaiHbaseVersion }}"
         imagePullPolicy: {{ .Values.pullPolicy }}
-        volumeMounts:
-        - mountPath: /opt/data/
-          name: hbase-opt-data
         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: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/hbase
+      - name: localtime
+        hostPath:
+          path: /etc/localtime
       imagePullSecrets:
-      - name: onap-docker-registry-key
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}