Make OOM workable with Dublin

[aaf/authz.git] / auth / helm / aaf / templates / aaf-service.yaml

diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index 117a075..5b9fe18 100644 (file)
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -29,11 +29,10 @@ spec:
   selector:
     app: aaf-service
   ports:
-    - name: aaf-service
+    - name: {{.Values.services.service.fqdn}}
       protocol: TCP
-      nodePort: 30080
-      port: 8100
-      targetPort: 8100
+      nodePort: {{.Values.services.service.public_port}}
+      port: {{.Values.services.service.internal_port}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -42,7 +41,7 @@ metadata:
   labels:
     app: aaf-service
 spec:
-  replicas: 1
+  replicas: {{ .Values.services.service.replicas }}
   selector:
     matchLabels:
       app: aaf-service
@@ -52,39 +51,41 @@ spec:
         app: aaf-service
     spec:
       volumes:
-      - name: {{ .Chart.Name }}-config-vol
+      - name: aaf-config-vol
         persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-config-pvc
-      - name: {{ .Chart.Name }}-status-vol
+          claimName: aaf-config-pvc
+      - name: aaf-status-vol
         persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-status-pvc
+          claimName: aaf-status-pvc
       initContainers:
-        - name: {{ .Chart.Name }}-config-container
+        - name: aaf-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
           imagePullPolicy: IfNotPresent
           command: ["bash","/opt/app/aaf_config/bin/agent.sh"]
           volumeMounts:
             - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
+              name: aaf-config-vol
           env:
-            - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_env }}"
-            - name: LATITUDE
-              value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.cadi.cadi_longitude }}"
+            - name: aaf_env
+              value: "{{ .Values.services.aaf_env }}"
+            - name: cadi_latitude
+              value: "{{ .Values.services.cadi_latitude }}"
+            - name: cadi_longitude
+              value: "{{ .Values.services.cadi_longitude }}"
             - name: aaf_locator_container
               value: "helm"
             - name: aaf_locator_container_ns
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+              value: "{{ .Release.Namespace }}"
             - name: aaf_locate_url
-              value: "https://aaf-locate.onap:8095"
-            - name: aaf_locator_public_hostname
-              value: "aaf.osaaf.org"
+              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
+            - name: aaf_locator_public_fqdn
+              value: "{{.Values.services.public_fqdn}}"
+            - name: aaf_locator_name
+              value: "{{.Values.services.aaf_locator_name}}"
+            - name: aaf_locator_name_helm
+              value: "{{.Values.services.aaf_locator_name_helm}}"
             - name: CASSANDRA_CLUSTER
-              value: "aaf-cass"
+              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
 #            - name: CASSANDRA_USER
 #              value: ""
 #            - name: CASSANDRA_PASSWORD
@@ -95,17 +96,17 @@ spec:
 ###
 ### AAF-SERVICE
 ###
-      - name: {{ .Chart.Name }}-service
+      - name: aaf-service
         image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service aaf-cass && exec bin/service"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-cass && exec bin/service"]
         volumeMounts:
         -  mountPath: "/opt/app/osaaf"
-           name: {{ .Chart.Name }}-config-vol
+           name: aaf-config-vol
         -  mountPath: "/opt/app/aaf/status"
-           name: {{ .Chart.Name }}-status-vol
+           name: aaf-status-vol
         ports:
         - name: service
           protocol: TCP
-          containerPort: 8100
+          containerPort: {{.Values.services.service.internal_port}}