From dcd0cb51ce490f0d790713a2c1e9dc5fda36e70d Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 5 Apr 2019 14:50:36 -0500 Subject: [PATCH] Clean DB Shutdown status Issue-ID: AAF-802 Change-Id: If080259ac8751c5fbd62c15e9e77eee2b5d3c9cf Signed-off-by: Instrumental --- auth/helm/aaf/templates/aaf-cass-pv.yaml | 2 +- auth/helm/aaf/templates/aaf-cass-pvc.yaml | 2 +- auth/helm/aaf/templates/aaf-cass.yaml | 48 ++++++++++++----------- auth/helm/aaf/templates/aaf-cm.yaml | 32 +++++++-------- auth/helm/aaf/templates/aaf-config-pv.yaml | 2 +- auth/helm/aaf/templates/aaf-config-pvc.yaml | 2 +- auth/helm/aaf/templates/aaf-fs.yaml | 42 ++++++++++---------- auth/helm/aaf/templates/aaf-gui.yaml | 44 ++++++++++----------- auth/helm/aaf/templates/aaf-locate.yaml | 44 ++++++++++----------- auth/helm/aaf/templates/aaf-oauth.yaml | 42 ++++++++++---------- auth/helm/aaf/templates/aaf-service.yaml | 41 ++++++++++---------- auth/helm/aaf/templates/aaf-status-pv.yaml | 2 +- auth/helm/aaf/templates/aaf-status-pvc.yaml | 2 +- auth/helm/aaf/values.yaml | 60 +++++++++++++++++++++-------- 14 files changed, 197 insertions(+), 168 deletions(-) diff --git a/auth/helm/aaf/templates/aaf-cass-pv.yaml b/auth/helm/aaf/templates/aaf-cass-pv.yaml index 48633a21..97b567f7 100644 --- a/auth/helm/aaf/templates/aaf-cass-pv.yaml +++ b/auth/helm/aaf/templates/aaf-cass-pv.yaml @@ -23,7 +23,7 @@ kind: PersistentVolume apiVersion: v1 metadata: name: {{ .Chart.Name }}-cass-pv - namespace: {{ .Values.global.common.namespace }} + namespace: {{ .Values.services.namespace }} labels: app: {{ .Chart.Name }}-cass spec: diff --git a/auth/helm/aaf/templates/aaf-cass-pvc.yaml b/auth/helm/aaf/templates/aaf-cass-pvc.yaml index 9fcbe339..80091a35 100644 --- a/auth/helm/aaf/templates/aaf-cass-pvc.yaml +++ b/auth/helm/aaf/templates/aaf-cass-pvc.yaml @@ -23,7 +23,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ .Chart.Name }}-cass-pvc - namespace: {{ .Values.global.common.namespace }} + namespace: {{ .Values.services.namespace }} labels: app: {{ .Chart.Name }}-cass {{- if .Values.persistence.annotations }} diff --git a/auth/helm/aaf/templates/aaf-cass.yaml b/auth/helm/aaf/templates/aaf-cass.yaml index 6a205a0e..552303ca 100644 --- a/auth/helm/aaf/templates/aaf-cass.yaml +++ b/auth/helm/aaf/templates/aaf-cass.yaml @@ -30,16 +30,16 @@ spec: ports: - name: storage protocol: TCP - port: 7000 - containerPort: 7000 + port: {{.Values.services.cass.storage_port}} + containerPort: {{.Values.services.cass.storage_port}} - name: ssl-storage protocol: TCP - port: 7001 - containerPort: 7001 + port: {{.Values.services.cass.ssl_storage_port}} + containerPort: {{.Values.services.cass.ssl_storage_port}} - name: native-trans protocol: TCP - port: 9042 - containerPort: 9042 + port: {{.Values.services.cass.native_trans_port}} + containerPort: {{.Values.services.cass.native_trans_port}} --- apiVersion: apps/v1 kind: Deployment @@ -48,7 +48,7 @@ metadata: labels: app: aaf-cass spec: - replicas: {{ .Values.replicas.cass }} + replicas: {{ .Values.services.cass.replicas }} selector: matchLabels: app: aaf-cass @@ -58,44 +58,48 @@ spec: app: aaf-cass spec: volumes: - - name: {{ .Chart.Name }}-cass-vol + - name: aaf-cass-vol persistentVolumeClaim: - claimName: {{ .Chart.Name }}-cass-pvc - - name: {{ .Chart.Name }}-status-vol + claimName: aaf-cass-pvc + - name: aaf-status-vol persistentVolumeClaim: - claimName: {{ .Chart.Name }}-status-pvc + claimName: aaf-status-pvc containers: ### ### AAF-CASS ### - - name: {{ .Chart.Name }}-cass + - name: aaf-cass image: {{ .Values.image.repository }}onap/aaf/aaf_cass:{{ .Values.image.version }} imagePullPolicy: IfNotPresent # installing with cmd "onap" will not only initialize the DB, but add ONAP bootstrap data as well command: ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh","onap"] + lifecycle: + preStop: + exec: + command: ["/bin/sh","-c","rm /opt/app/aaf/status/aaf-cass"] volumeMounts: - mountPath: "/var/lib/cassandra" - name: {{ .Chart.Name }}-cass-vol + name: aaf-cass-vol - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol + name: aaf-status-vol ports: - name: storage - containerPort: 7000 + containerPort: {{.Values.services.cass.storage_port}} - name: ssl-storage - containerPort: 7001 + containerPort: {{.Values.services.cass.storage_port}} - name: native-trans - containerPort: 9042 + containerPort: {{.Values.services.cass.native_trans_port}} - name: rpc - containerPort: 9160 + containerPort: {{.Values.services.cass.rpc_port}} env: - name: CASSANDRA_CLUSTER_NAME - value: "osaaf" + value: {{.Values.services.cass.cluster_name}} - name: CASSANDRA_DC - value: "dc1" + value: {{.Values.services.cass.dc}} - name: HEAP_NEWSIZE - value: "512M" + value: {{.Values.services.cass.heap_new_size}} - name: MAX_HEAP_SIZE - value: "1024M" + value: {{.Values.services.cass.max_heap_size}} - name: MY_POD_NAME valueFrom: fieldRef: diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml index cd43f7ae..b64a968e 100644 --- a/auth/helm/aaf/templates/aaf-cm.yaml +++ b/auth/helm/aaf/templates/aaf-cm.yaml @@ -41,7 +41,7 @@ metadata: labels: app: aaf-cm spec: - replicas: {{ .Values.replicas.cm }} + replicas: {{ .Values.services.cm.replicas }} selector: matchLabels: app: aaf-cm @@ -52,27 +52,27 @@ spec: spec: volumes: # Use this Pod Sharing dir to declare various States of starting - - 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 }}" + value: "{{ .Values.services.aaf_env }}" - name: LATITUDE - value: "{{ .Values.cadi.cadi_latitude }}" + value: "{{ .Values.services.cadi_latitude }}" - name: LONGITUDE - value: "{{ .Values.cadi.cadi_longitude }}" + value: "{{ .Values.services.cadi_longitude }}" - name: aaf_locator_container value: "helm" - name: aaf_locator_container_ns @@ -80,11 +80,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: aaf_locate_url - value: "https://aaf-locate.onap:8095" + value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}" - name: aaf_locator_public_fqdn - value: "aaf.osaaf.org" + value: "{{.Values.services.public_fqdn}}" - name: CASSANDRA_CLUSTER - value: "aaf-cass" + value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}" # - name: CASSANDRA_USER # value: "" # - name: CASSANDRA_PASSWORD @@ -95,15 +95,15 @@ spec: ### ### AAF-CERTMAN ### - - name: {{ .Chart.Name }}-cm + - name: aaf-cm image: {{ .Values.image.repository }}onap/aaf/aaf_cm:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"] 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: aaf-cm protocol: TCP diff --git a/auth/helm/aaf/templates/aaf-config-pv.yaml b/auth/helm/aaf/templates/aaf-config-pv.yaml index 7066f520..378ab808 100644 --- a/auth/helm/aaf/templates/aaf-config-pv.yaml +++ b/auth/helm/aaf/templates/aaf-config-pv.yaml @@ -23,7 +23,7 @@ kind: PersistentVolume apiVersion: v1 metadata: name: {{ .Chart.Name }}-config-pv - namespace: {{ .Values.global.common.namespace }} + namespace: {{ .Values.services.namespace }} labels: app: {{ .Chart.Name }}-config spec: diff --git a/auth/helm/aaf/templates/aaf-config-pvc.yaml b/auth/helm/aaf/templates/aaf-config-pvc.yaml index 9136712b..6a6aee36 100644 --- a/auth/helm/aaf/templates/aaf-config-pvc.yaml +++ b/auth/helm/aaf/templates/aaf-config-pvc.yaml @@ -23,7 +23,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ .Chart.Name }}-config-pvc - namespace: {{ .Values.global.common.namespace }} + namespace: {{ .Values.services.namespace }} labels: app: {{ .Chart.Name }}-config {{- if .Values.persistence.annotations }} diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml index 5d75bb98..5adc1d62 100644 --- 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: {{ .Values.replicas.fs }} + replicas: {{ .Values.services.fs.replicas }} selector: matchLabels: app: aaf-fs @@ -52,27 +52,27 @@ spec: spec: volumes: # Use this Pod Sharing dir to declare various States of starting - - 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 }}" + value: "{{ .Values.services.aaf_env }}" - name: LATITUDE - value: "{{ .Values.cadi.cadi_latitude }}" + value: "{{ .Values.services.cadi_latitude }}" - name: LONGITUDE - value: "{{ .Values.cadi.cadi_longitude }}" + value: "{{ .Values.services.cadi_longitude }}" - name: aaf_locator_container value: "helm" - name: aaf_locator_fqdn @@ -80,9 +80,9 @@ spec: fieldRef: fieldPath: status.podIP - name: aaf_locate_url - value: "https://aaf-locate:8095" + value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}" - name: CASSANDRA_CLUSTER - value: "aaf-cass" + value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}" # - name: CASSANDRA_USER # value: "" # - name: CASSANDRA_PASSWORD @@ -93,19 +93,19 @@ spec: ### ### AAF-FS ### - - name: {{ .Chart.Name }}-fs + - name: aaf-fs image: {{ .Values.image.repository }}onap/aaf/aaf_fs:{{ .Values.image.version }} imagePullPolicy: IfNotPresent 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 + name: aaf-config-vol - mountPath: "/opt/app/aaf/status" - name: {{ .Chart.Name }}-status-vol + 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" @@ -116,5 +116,5 @@ spec: - name: aaf_locate_url value: "https://aaf-locate.onap:8095" - name: aaf_locator_public_fqdn - value: "aaf.osaaf.org" + value: "{{.Values.services.public_fqdn}}" diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml index dcc1f7f0..758b6b27 100644 --- a/auth/helm/aaf/templates/aaf-gui.yaml +++ b/auth/helm/aaf/templates/aaf-gui.yaml @@ -29,11 +29,11 @@ spec: app: aaf-gui type: NodePort ports: - - name: aaf-gui + - name: {{.Values.services.gui.fqdn}} protocol: TCP nodePort: 30083 - port: 8200 - targetPort: 8200 + port: {{.Values.services.gui.internal_port}} + targetPort: {{.Values.services.gui.internal_port}} --- apiVersion: apps/v1 kind: Deployment @@ -42,7 +42,7 @@ metadata: labels: app: aaf-gui spec: - replicas: {{ .Values.replicas.gui }} + replicas: {{ .Values.services.gui.replicas }} selector: matchLabels: app: aaf-gui @@ -53,27 +53,27 @@ spec: spec: volumes: # Use this Pod Sharing dir to declare various States of starting - - 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 }}" + value: "{{ .Values.services.aaf_env }}" - name: LATITUDE - value: "{{ .Values.cadi.cadi_latitude }}" + value: "{{ .Values.services.cadi_latitude }}" - name: LONGITUDE - value: "{{ .Values.cadi.cadi_longitude }}" + value: "{{ .Values.services.cadi_longitude }}" - name: aaf_locator_container value: "helm" - name: aaf_locator_container_ns @@ -81,11 +81,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: aaf_locate_url - value: "https://aaf-locate.onap:8095" + value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}" - name: aaf_locator_public_fqdn - value: "aaf.osaaf.org" + value: "{{.Values.services.public_fqdn}}" - name: CASSANDRA_CLUSTER - value: "aaf-cass" + value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}" # - name: CASSANDRA_USER # value: "" # - name: CASSANDRA_PASSWORD @@ -96,18 +96,16 @@ spec: ### ### AAF-GUI ### - - name: {{ .Chart.Name }}-gui + - name: aaf-gui image: {{ .Values.image.repository }}onap/aaf/aaf_gui:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"] 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: aaf-gui + - name: {{.Values.services.gui.fqdn}} protocol: TCP - containerPort: 8200 - - + containerPort: {{.Values.services.gui.internal_port}} diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml index 8506d329..a6a2e258 100644 --- a/auth/helm/aaf/templates/aaf-locate.yaml +++ b/auth/helm/aaf/templates/aaf-locate.yaml @@ -29,10 +29,10 @@ spec: app: aaf-locate type: NodePort ports: - - name: aaf-locate + - name: {{.Values.services.locate.fqdn}} protocol: TCP - port: 8095 - nodePort: 30081 + port: {{.Values.services.locate.internal_port}} + nodePort: {{.Values.services.locate.public_port}} --- apiVersion: apps/v1 kind: Deployment @@ -41,7 +41,7 @@ metadata: labels: app: aaf-locate spec: - replicas: {{ .Values.replicas.locate }} + replicas: {{ .Values.services.locate.replicas }} selector: matchLabels: app: aaf-locate @@ -52,27 +52,27 @@ spec: spec: volumes: # Use this Pod Sharing dir to declare various States of starting - - 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 }}" + value: "{{ .Values.services.aaf_env }}" - name: LATITUDE - value: "{{ .Values.cadi.cadi_latitude }}" + value: "{{ .Values.services.cadi_latitude }}" - name: LONGITUDE - value: "{{ .Values.cadi.cadi_longitude }}" + value: "{{ .Values.services.cadi_longitude }}" - name: aaf_locator_container value: "helm" - name: aaf_locator_container_ns @@ -80,34 +80,34 @@ spec: fieldRef: fieldPath: metadata.namespace - name: aaf_locate_url - value: "https://aaf-locate.onap:8095" + value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}" - name: aaf_locator_public_fqdn - value: "aaf.osaaf.org" + value: "{{.Values.services.public_fqdn}}" - name: CASSANDRA_CLUSTER - value: "aaf-cass" + value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}" # - name: CASSANDRA_USER # value: "" # - name: CASSANDRA_PASSWORD # value: "" # - name: CASSANDRA_PORT -# value: ""jjjjn +# value: "" containers: ### ### AAF-LOCATE ### - - name: {{ .Chart.Name }}-locate + - name: aaf-locate image: {{ .Values.image.repository }}onap/aaf/aaf_locate:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate aaf-service && exec bin/locate"] 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: aaf-locate + - name: {{.Values.services.locate.fqdn}} protocol: TCP - containerPort: 8095 + containerPort: {{.Values.services.locate.internal_port}} env: - name: aaf_locator_ns valueFrom: diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml index 722cc633..2e2acb4b 100644 --- a/auth/helm/aaf/templates/aaf-oauth.yaml +++ b/auth/helm/aaf/templates/aaf-oauth.yaml @@ -29,10 +29,10 @@ spec: app: aaf-oauth type: NodePort ports: - - name: aaf-oauth + - name: {{.Values.services.oauth.fqdn}} protocol: TCP - port: 8140 - nodePort: 30082 + port: {{.Values.services.oauth.internal_port}} + nodePort: {{.Values.services.oauth.public_port}} --- apiVersion: apps/v1 kind: Deployment @@ -41,7 +41,7 @@ metadata: labels: app: aaf-oauth spec: - replicas: {{ .Values.replicas.oauth }} + replicas: {{ .Values.services.oauth.replicas }} selector: matchLabels: app: aaf-oauth @@ -52,27 +52,27 @@ spec: spec: volumes: # Use this Pod Sharing dir to declare various States of starting - - 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 }}" + value: "{{ .Values.services.aaf_env }}" - name: LATITUDE - value: "{{ .Values.cadi.cadi_latitude }}" + value: "{{ .Values.services.cadi_latitude }}" - name: LONGITUDE - value: "{{ .Values.cadi.cadi_longitude }}" + value: "{{ .Values.services.cadi_longitude }}" - name: aaf_locator_container value: "helm" - name: aaf_locator_container_ns @@ -80,11 +80,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: aaf_locate_url - value: "https://aaf-locate.onap:8095" + value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}" - name: aaf_locator_public_fqdn - value: "aaf.osaaf.org" + value: "{{.Values.services.public_fqdn}}" - name: CASSANDRA_CLUSTER - value: "aaf-cass" + value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}" # - name: CASSANDRA_USER # value: "" # - name: CASSANDRA_PASSWORD @@ -95,19 +95,19 @@ spec: ### ### AAF-OAUTH ### - - name: {{ .Chart.Name }}-oauth + - name: aaf-oauth image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"] 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: aaf-oauth + - name: {{.Values.services.oauth.fqdn}} protocol: TCP - containerPort: 8140 + containerPort: {{.Values.services.oauth.internal_port}} env: - name: aaf_locator_ns valueFrom: diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml index 4a8f0b31..a0935a65 100644 --- 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: {{ .Values.replicas.service }} + replicas: {{ .Values.services.service.replicas }} selector: matchLabels: app: aaf-service @@ -52,27 +51,27 @@ 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 }}" + value: "{{ .Values.services.aaf_env }}" - name: LATITUDE - value: "{{ .Values.cadi.cadi_latitude }}" + value: "{{ .Values.services.cadi_latitude }}" - name: LONGITUDE - value: "{{ .Values.cadi.cadi_longitude }}" + value: "{{ .Values.services.cadi_longitude }}" - name: aaf_locator_container value: "helm" - name: aaf_locator_container_ns @@ -80,11 +79,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: aaf_locate_url - value: "https://aaf-locate.onap:8095" + value: "https://{{.Values.services.locate.fqdn}}.{{.Values.services.ns}}:{{.Values.services.locate.internal_port}}" - name: aaf_locator_public_fqdn - value: "aaf.osaaf.org" + value: "{{.Values.services.public_fqdn}}" - name: CASSANDRA_CLUSTER - value: "aaf-cass" + value: "{{.Values.services.cass.fqdn}}.{{.Values.services.ns}}" # - name: CASSANDRA_USER # value: "" # - name: CASSANDRA_PASSWORD @@ -95,17 +94,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"] 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}} diff --git a/auth/helm/aaf/templates/aaf-status-pv.yaml b/auth/helm/aaf/templates/aaf-status-pv.yaml index 418a368b..15e102c0 100644 --- a/auth/helm/aaf/templates/aaf-status-pv.yaml +++ b/auth/helm/aaf/templates/aaf-status-pv.yaml @@ -23,7 +23,7 @@ kind: PersistentVolume apiVersion: v1 metadata: name: {{ .Chart.Name }}-status-pv - namespace: {{ .Values.global.common.namespace }} + namespace: {{ .Values.services.namespace }} labels: app: {{ .Chart.Name }}-status spec: diff --git a/auth/helm/aaf/templates/aaf-status-pvc.yaml b/auth/helm/aaf/templates/aaf-status-pvc.yaml index 2a402ff9..44a5aa9c 100644 --- a/auth/helm/aaf/templates/aaf-status-pvc.yaml +++ b/auth/helm/aaf/templates/aaf-status-pvc.yaml @@ -23,7 +23,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ .Chart.Name }}-status-pvc - namespace: {{ .Values.global.common.namespace }} + namespace: {{ .Values.services.namespace }} labels: app: {{ .Chart.Name }}-status {{- if .Values.persistence.annotations }} diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index e1fce7fe..226f030c 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -25,26 +25,54 @@ global: persistence: enabled: true - common: - namespace: "onap" -replicas: - cass: 1 - service: 1 - locator: 1 - oauth: 1 - cm: 1 - gui: 1 - -ingress: - enabled: false - -cadi: +services: + ns: "onap" + aaf_env: "DEV" public_fqdn: "aaf.osaaf.org" cadi_latitude: "38.0" cadi_longitude: "-72.0" - aaf_env: "DEV" - + cass: + replicas: 1 + cluster_name: "osaaf" + heap_new_size: "512M" + max_heap_size: "1024M" + storage_port: 7000 + ssl_storage_port: 7001 + native_trans_port: 9042 + rpc_port: 9160 + dc: "dc1" + service: + replicas: 1 + fqdn: "aaf-service" + internal_port: 8100 + public_port: 30080 + locate: + replicas: 1 + fqdn: "aaf-locate" + internal_port: 8095 + public_port: 30081 + oauth: + replicas: 1 + fqdn: "aaf-oauth" + internal_port: 8140 + public_port: 30082 + cm: + replicas: 1 + fqdn: "aaf-cm" + internal_port: 8150 + public_port: 30084 + gui: + replicas: 1 + fqdn: "aaf-gui" + internal_port: 8200 + public_port: 30083 + fs: + replicas: 1 + fqdn: "aaf-fs" + internal_port: 8096 + public_port: 30085 + persistence: # Note: Minikube will persist to /data on your host machine mountPath: "/data/aaf" -- 2.16.6