diff options
Diffstat (limited to 'kubernetes/aaf/charts/aaf-hello')
| -rw-r--r-- | kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/aaf/charts/aaf-hello/values.yaml | 12 |
2 files changed, 13 insertions, 11 deletions
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml index 0ec768b99d..c5fcf68a58 100644 --- a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml +++ b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml @@ -40,7 +40,7 @@ spec: - name: "{{ include "common.namespace" . }}-docker-registry-key" initContainers: - name: {{ include "common.name" . }}-config - image: {{ .Values.global.repository }}/{{.Values.service.agentImage}} + image: {{ .Values.global.repository }}/{{.Values.aaf_init.image}} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: "/opt/app/osaaf" @@ -49,7 +49,7 @@ spec: command: ["bash","-c","exec /opt/app/aaf_config/bin/agent.sh"] env: - name: APP_FQI - value: "{{ .Values.service.fqi }}" + value: "{{ .Values.aaf_init.fqi }}" - name: aaf_locate_url value: "https://aaf-locate.{{ .Release.Namespace}}:8095" - name: aaf_locator_container @@ -57,9 +57,9 @@ spec: - name: aaf_locator_container_ns value: "{{ .Release.Namespace }}" - name: aaf_locator_fqdn - value: "{{ .Values.service.fqdn }}" + value: "{{ .Values.aaf_init.fqdn }}" - name: aaf_locator_app_ns - value: "{{ .Values.service.app_ns }}" + value: "{{ .Values.aaf_init.app_ns }}" - name: DEPLOY_FQI value: "deployer@people.osaaf.org" # Note: We want to put this in Secrets or at LEAST ConfigMaps @@ -67,9 +67,9 @@ spec: value: "demo123456!" # Note: want to put this on Nodes, evenutally - name: cadi_longitude - value: "{{ .Values.service.cadi_longitude }}" + value: "{{ .Values.aaf_init.cadi_longitude }}" - name: cadi_latitude - value: "{{ .Values.service.cadi_latitude }}" + value: "{{ .Values.aaf_init.cadi_latitude }}" # Hello specific. Clients don't don't need this, unless Registering with AAF Locator - name: aaf_locator_public_fqdn value: "{{.Values.global.aaf.public_fqdn}}" diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml index 15b6039b59..ea6665c61a 100644 --- a/kubernetes/aaf/charts/aaf-hello/values.yaml +++ b/kubernetes/aaf/charts/aaf-hello/values.yaml @@ -24,22 +24,24 @@ flavor: small # Application configuration defaults. ################################################################# # application image -service: +aaf_init: # You might want this in your own app. For AAF, we store in global # replicas: 1 fqdn: "aaf-hello" - agentImage: onap/aaf/aaf_agent:2.1.15-SNAPSHOT - image: onap/aaf/aaf_hello:2.1.15-SNAPSHOT + image: onap/aaf/aaf_agent:2.1.15 app_ns: "org.osaaf.aaf" fqi: "aaf@aaf.osaaf.org" fqdn: "aaf-hello" public_fqdn: "aaf.osaaf.org" - port: "8130" - public_port: "31116" deploy_fqi: "deployer@people.osaaf.org" cadi_latitude: "38.0" cadi_longitude: "-72.0" +service: + image: onap/aaf/aaf_hello:2.1.15 + port: "8130" + public_port: "31119" + persistence: enabled: true config: |