Add standardized helm chart for aai

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

diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
similarity index 78%
rename from kubernetes/aai/templates/aai-traversal-deployment.yaml
rename to kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
index f039d0f..b4249ae 100644 (file)
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
@@ -12,22 +12,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#{{ if not .Values.disableAaiAaiTraversal }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: aai-traversal
-  namespace: "{{ .Values.nsPrefix }}"
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.aaiTraversalReplicas }}
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: aai-traversal
+      app: {{ include "common.name" . }}
   template:
     metadata:
       labels:
-        app: aai-traversal
-      name: aai-traversal
+        app: {{ include "common.name" . }}
+        release: {{ .Release.Name }}
+      name: {{ include "common.name" . }}
       annotations:
         msb.onap.org/service-info: '[
           {
@@ -245,8 +250,6 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - hbase
-        - --container-name
         - aai-resources
         env:
         - name: NAMESPACE
@@ -254,26 +257,26 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: aai-traversal-readiness
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        name: {{ include "common.name" . }}-readiness
       containers:
-      - name: aai-traversal
-        image: "{{ .Values.image.aaiTraversalImage }}:{{ .Values.image.aaiTraversalVersion }}"
-        imagePullPolicy: {{ .Values.pullPolicy }}
+      - name: {{ include "common.name" . }}
+        image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         env:
         - name: CHEF_BRANCH
           value: master
         - name: AAI_CHEF_ENV
           value: simpledemo
         - name: AAI_CORE_VERSION
-          value: {{ .Values.aaicoreversion }}
+          value: {{ .Values.config.aaicoreversion }}
         - name: AAI_CHEF_LOC
           value: /var/chef/aai-data/environments
         - name: CHEF_GIT_URL
           value: http://gerrit.onap.org/r/aai
         - name: RESOURCES_HOSTNAME
-          value: aai-resources.{{ .Values.nsPrefix }}
+          value: aai-resources.{{ include "common.namespace" . }}
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
@@ -289,15 +292,37 @@ spec:
           name: aai-traversal-log-conf
           subPath: logback.xml
         ports:
-        - containerPort: 8446
+        - containerPort: {{ .Values.service.internalPort }}
+        - containerPort: {{ .Values.service.internalPort2 }}
+        # disable liveness probe when breakpoints set in debugger
+        # so K8s doesn't restart unresponsive container
+        {{ if .Values.liveness.enabled }}
+        livenessProbe:
+          tcpSocket:
+            port: {{ .Values.service.internalPort }}
+          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.liveness.periodSeconds }}
+        {{ end }}
         readinessProbe:
           tcpSocket:
-            port: 8446
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      - name: filebeat-onap-aai-traversal
-        image: {{ .Values.image.filebeat }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
+            port: {{ .Values.service.internalPort }}
+          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+          periodSeconds: {{ .Values.readiness.periodSeconds }}
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end -}}
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+      {{- end }}
+
+      # side car containers
+      - name: filebeat-onap
+        image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: /usr/share/filebeat/filebeat.yml
           subPath: filebeat.yml
@@ -306,28 +331,27 @@ spec:
           name: aai-traversal-logs
         - mountPath: /usr/share/filebeat/data
           name: aai-traversal-filebeat
+
       volumes:
       - name: localtime
         hostPath:
           path: /etc/localtime
       - name: aai-chef-config
         configMap:
-          name: aai-chef-config-configmap
+          name: aai-chef-config
       - name: aai-data
         configMap:
-          name: aai-resources-environments-configmap
+          name: aai-resources-environments
       - name: filebeat-conf
         configMap:
-          name: aai-filebeat-configmap
+          name: aai-filebeat
       - name: aai-traversal-logs
         emptyDir: {}
       - name: aai-traversal-filebeat
         emptyDir: {}
       - name: aai-traversal-log-conf
         configMap:
-         name: aai-traversal-log-configmap
-      restartPolicy: Always
+         name: {{ include "common.fullname" . }}-log
+      restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
       imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
-
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"