Reduce Docker Layers

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

diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index b38257f..5bca696 100644 (file)
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -29,10 +29,10 @@ spec:
     app: aaf-fs
   type: NodePort
   ports:
-    - name: aaf-fs
+    - name: {{.Values.services.fs.fqdn}}
       protocol: TCP
-      port: 8096
-      NodePort: 30085
+      port: {{.Values.services.fs.internal_port}}
+      nodePort: {{.Values.services.fs.public_port}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -41,7 +41,7 @@ metadata:
   labels:
     app: aaf-fs
 spec:
-  replicas: 1
+  replicas: {{ .Values.services.fs.replicas }}
   selector:
     matchLabels:
       app: aaf-fs
@@ -52,40 +52,75 @@ spec:
     spec:
       volumes:
         # Use this Pod Sharing dir to declare various States of starting
-      - name: {{ .Chart.Name }}-config-vol
-        emptyDir: {}
+      - name: aaf-config-vol
+        persistentVolumeClaim:
+          claimName: aaf-config-pvc
+      - name: aaf-status-vol
+        persistentVolumeClaim:
+          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","-c","cd /opt/app/aaf_config && bin/pod_wait.sh config aaf-service rm && bin/agent.sh"]
           volumeMounts:
             - mountPath: "/opt/app/osaaf"
-              name: {{ .Chart.Name }}-config-vol
+              name: aaf-config-vol
+            - mountPath: "/opt/app/aaf/status"
+              name: aaf-status-vol
           env:
             - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_env }}"
-            - name: AAF_REGISTER_AS
-              value: "aaf-fs"
-            - name: AAF_LOCATOR_AS
-              value: "{{ .Values.cadi.aaf_locate_as }}"
+              value: "{{ .Values.services.aaf_env }}"
             - name: LATITUDE
-              value: "{{ .Values.cadi.cadi_latitude }}"
+              value: "{{ .Values.services.cadi_latitude }}"
             - name: LONGITUDE
-              value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: CASS_HOST
-              value: "aaf-cass"
+              value: "{{ .Values.services.cadi_longitude }}"
+            - name: aaf_locator_container
+              value: "helm"
+            - name: aaf_locator_fqdn
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: aaf_locate_url
+              value: "https://aaf-locate.{{.Release.Namespace }}:{{.Values.services.locate.internal_port}}"
+            - name: CASSANDRA_CLUSTER
+              value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}"
+#            - name: CASSANDRA_USER
+#              value: ""
+#            - name: CASSANDRA_PASSWORD
+#              value: ""
+#           - name: CASSANDRA_PORT
+#              value: ""
       containers:
 ###
 ### AAF-FS
 ###
-      - name: {{ .Chart.Name }}-fs
-        image: {{ .Values.image.repository }}onap/aaf/aaf_fs:{{ .Values.image.version }}
+      - name: aaf-fs
+        image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_fs","sleep","50", "cd /opt/app/aaf;bin/fs"]
+        command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"]
         volumeMounts:
-          -  mountPath: "/opt/app/osaaf"
-             name: {{ .Chart.Name }}-config-vol
+        - mountPath: "/opt/app/osaaf"
+          name: aaf-config-vol
+        - mountPath: "/opt/app/aaf/status"
+          name: aaf-status-vol
         ports:
-        - name: aaf-fs
+        - name: {{.Values.services.fs.fqdn}}
           protocol: TCP
-          containerPort: 8096
+          containerPort: {{.Values.services.fs.internal_port}}
+        env:
+            - name: aaf_locator_container
+              value: "helm"
+            - name: aaf_locator_container_ns
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: aaf_locate_url
+              value: "https://aaf-locate.onap:8095"
+            - 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}}"
+