aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-10-16 20:40:41 -0500
committerInstrumental <jonathan.gathman@att.com>2018-10-17 12:30:06 -0500
commit378109d989a227e0ed80792db32027ee612e995f (patch)
tree858a73482f558ba7fce3ded95cf5eedd0a548c23 /kubernetes
parent56b24225b64d9ae2354d640405b61ea97234f7cf (diff)
Recommended AAF/OOM Changes
This incorporats Mike E's changes as well as recommended changes from Abandoned 70511 (merges from multiple machines got too hard.) Made Olaf recommended changes. Changed to non-SNAPSHOT in anticipation of LF releasing this morning Put Versions back to "2.1.5-SNAPSHOT" Brian F reminded me that GWu's scripts handle version changes for Envs. Issue-ID: AAF-557 Change-Id: I3e81a9c65df356d1d27b0d453e09c9ed3a81f803 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml44
-rw-r--r--kubernetes/aaf/charts/aaf-cm/values.yaml5
-rw-r--r--kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/charts/aaf-cs/values.yaml4
-rw-r--r--kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml44
-rw-r--r--kubernetes/aaf/charts/aaf-fs/values.yaml5
-rw-r--r--kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml44
-rw-r--r--kubernetes/aaf/charts/aaf-gui/values.yaml6
-rw-r--r--kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml45
-rw-r--r--kubernetes/aaf/charts/aaf-hello/values.yaml5
-rw-r--r--kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml45
-rw-r--r--kubernetes/aaf/charts/aaf-locate/values.yaml5
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml46
-rw-r--r--kubernetes/aaf/charts/aaf-oauth/values.yaml5
-rw-r--r--kubernetes/aaf/charts/aaf-service/templates/deployment.yaml44
-rw-r--r--kubernetes/aaf/charts/aaf-service/values.yaml5
-rw-r--r--kubernetes/aaf/templates/job.yaml74
-rw-r--r--kubernetes/aaf/templates/pv.yaml73
-rw-r--r--kubernetes/aaf/templates/pvc.yaml81
-rw-r--r--kubernetes/aaf/values.yaml10
20 files changed, 193 insertions, 399 deletions
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
index 39544258fd..8655054660 100644
--- a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
@@ -31,20 +31,27 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- /root/ready.py
@@ -66,7 +73,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +103,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml
index 3d6438dcff..cb53098c30 100644
--- a/kubernetes/aaf/charts/aaf-cm/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/values.yaml
@@ -25,7 +25,8 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_cm:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_cm:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-cm.onap"
pullPolicy: Always
@@ -76,4 +77,4 @@ resources:
requests:
cpu: 40m
memory: 600Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml
index d52e877154..3abdcb3c7f 100644
--- a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml
@@ -89,4 +89,4 @@ spec:
emptyDir: {}
{{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-cs/values.yaml b/kubernetes/aaf/charts/aaf-cs/values.yaml
index 93dd58935c..61c0808102 100644
--- a/kubernetes/aaf/charts/aaf-cs/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cs/values.yaml
@@ -24,7 +24,7 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_cass:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_cass:2.1.5-SNAPSHOT
pullPolicy: Always
# application configuration
@@ -94,4 +94,4 @@ persistence:
volumeReclaimPolicy: Retain
accessMode: ReadWriteOnce
size: 10Gi
- storageClass: "manual" \ No newline at end of file
+ storageClass: "manual"
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
index 5125eb161e..cfafba7088 100644
--- a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
@@ -31,20 +31,27 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- /root/ready.py
@@ -66,7 +73,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +103,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-fs/values.yaml b/kubernetes/aaf/charts/aaf-fs/values.yaml
index e656c43334..9352ba9c10 100644
--- a/kubernetes/aaf/charts/aaf-fs/values.yaml
+++ b/kubernetes/aaf/charts/aaf-fs/values.yaml
@@ -25,7 +25,8 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_fs:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_fs:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-fs.onap"
pullPolicy: Always
@@ -76,4 +77,4 @@ resources:
requests:
cpu: 100m
memory: 400Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
index 24c8e68cec..03424125e4 100644
--- a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
@@ -31,20 +31,27 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- /root/ready.py
@@ -66,7 +73,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +103,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-gui/values.yaml b/kubernetes/aaf/charts/aaf-gui/values.yaml
index 756bf2f5e0..490fc7e463 100644
--- a/kubernetes/aaf/charts/aaf-gui/values.yaml
+++ b/kubernetes/aaf/charts/aaf-gui/values.yaml
@@ -1,3 +1,4 @@
+
# Copyright © 2017 Amdocs, Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +26,8 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_gui:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_gui:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-gui.onap"
pullPolicy: Always
@@ -77,4 +79,4 @@ resources:
requests:
cpu: 100m
memory: 500Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
index f932228cd9..d3049e0239 100644
--- a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
@@ -31,20 +31,28 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- /root/ready.py
@@ -66,7 +74,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +104,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml
index b8bbaed9a9..cccb0b34ae 100644
--- a/kubernetes/aaf/charts/aaf-hello/values.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/values.yaml
@@ -25,7 +25,8 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_hello:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_hello:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-hello.onap"
pullPolicy: Always
@@ -76,4 +77,4 @@ resources:
requests:
cpu: 20m
memory: 500Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
index a3a9e285cf..ea4e3e8a47 100644
--- a/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
@@ -31,20 +31,28 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- /root/ready.py
@@ -66,7 +74,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +104,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml
index 16c02cd965..6a75393007 100644
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/values.yaml
@@ -25,7 +25,8 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_locate:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_locate:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-locate.onap"
pullPolicy: Always
@@ -76,4 +77,4 @@ resources:
requests:
cpu: 40m
memory: 500Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
index 06cf2736ef..aed0bbe785 100644
--- a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
@@ -31,23 +31,30 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- - /root/ready.py
+ - /root/ready.py
args:
- --container-name
- aaf-locate
@@ -66,7 +73,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +103,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-oauth/values.yaml b/kubernetes/aaf/charts/aaf-oauth/values.yaml
index 72c793a150..651f53e104 100644
--- a/kubernetes/aaf/charts/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/charts/aaf-oauth/values.yaml
@@ -25,7 +25,8 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_oauth:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_oauth:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-oauth.onap"
pullPolicy: Always
@@ -76,4 +77,4 @@ resources:
requests:
cpu: 40m
memory: 200Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
index c3c140a35d..35b17ba5a5 100644
--- a/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
+++ b/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
@@ -31,20 +31,27 @@ spec:
release: {{ .Release.Name }}
spec:
initContainers:
- - name: {{ include "common.name" . }}-job-complete
- command:
- - /root/job_complete.py
- args:
- - --job-name
- - {{ .Release.Name }}-create-config
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ - name: {{ include "common.name" . }}-config-container
+ image: "{{ include "common.repository" . }}/{{ .Values.global.configImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: "/opt/app/osaaf"
+ name: {{ include "common.name" . }}-config-vol
+ env:
+ - name: HOSTNAME
+ value: "{{ .Values.global.cadi.hostname }}"
+ - name: AAF_ENV
+ value: "{{ .Values.global.cadi.aaf_env }}"
+ - name: AAF_REGISTER_AS
+ value: "{{ .Values.aaf_register_as }}"
+ - name: LATITUDE
+ value: "{{ .Values.global.cadi.cadi_latitude }}"
+ - name: LONGITUDE
+ value: "{{ .Values.global.cadi.cadi_longitude }}"
+ - name: CASS_HOST
+ value: "{{ .Values.global.cadi.cass_host }}"
+ - name: AAF_LOCATOR_AS
+ value: "{{ .Values.global.cadi.cadi_locator_as }}"
- name: {{ include "common.name" . }}-readiness
command:
- /root/ready.py
@@ -66,7 +73,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: "/opt/app/osaaf"
- name: shared-config-volume
+ name: {{ include "common.name" . }}-config-vol
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -96,12 +103,7 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- - name: shared-config-volume
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
+ - name: {{ include "common.name" . }}-config-vol
emptyDir: {}
- {{- end }}
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/charts/aaf-service/values.yaml b/kubernetes/aaf/charts/aaf-service/values.yaml
index 19daaae461..e3f81f28a4 100644
--- a/kubernetes/aaf/charts/aaf-service/values.yaml
+++ b/kubernetes/aaf/charts/aaf-service/values.yaml
@@ -25,7 +25,8 @@ flavor: small
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/aaf/aaf_service:2.1.4-SNAPSHOT
+image: onap/aaf/aaf_service:2.1.5-SNAPSHOT
+aaf_register_as: "aaf-service.onap"
pullPolicy: Always
@@ -77,4 +78,4 @@ resources:
requests:
cpu: 40m
memory: 300Mi
- unlimited: {} \ No newline at end of file
+ unlimited: {}
diff --git a/kubernetes/aaf/templates/job.yaml b/kubernetes/aaf/templates/job.yaml
deleted file mode 100644
index 103b908491..0000000000
--- a/kubernetes/aaf/templates/job.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: batch/v1
-kind: Job
-metadata:
- name: {{ .Release.Name }}-create-config
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- template:
- metadata:
- labels:
- app: aaf-init-job
- release: {{ .Release.Name }}
- spec:
- containers:
- - name: {{ include "common.name" . }}-config-container
- image: "{{ include "common.repository" . }}/{{ .Values.aaf_config.image }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - mountPath: "/opt/app/osaaf"
- name: {{ include "common.name" . }}-config-vol
- env:
- - name: HOSTNAME
- value: "{{ .Values.global.cadi.hostname }}"
- - name: AAF_ENV
- value: "{{ .Values.global.cadi.aaf_env }}"
- - name: AAF_REGISTER_AS
- value: "{{ .Values.global.cadi.aaf_register_as }}"
- - name: LATITUDE
- value: "{{ .Values.global.cadi.cadi_latitude }}"
- - name: LONGITUDE
- value: "{{ .Values.global.cadi.cadi_longitude }}"
- - name: CASS_HOST
- value: "{{ .Values.global.cassandraServiceName }}"
- - name: AAF_LOCATOR_AS
- value: "{{ .Values.global.locateServiceName }}"
- resources:
-{{ include "common.resources" . | indent 12 }}
- {{- if .Values.nodeSelector }}
- nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 10 }}
- {{- end -}}
- {{- if .Values.affinity }}
- affinity:
-{{ toYaml .Values.affinity | indent 10 }}
- {{- end }}
- volumes:
- - name: {{ include "common.name" . }}-config-vol
- {{- if .Values.global.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ .Release.Name }}-config
- {{- else }}
- emptyDir: {}
- {{- end }}
- restartPolicy: OnFailure
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/aaf/templates/pv.yaml b/kubernetes/aaf/templates/pv.yaml
deleted file mode 100644
index 9d28184985..0000000000
--- a/kubernetes/aaf/templates/pv.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-{{- if and .Values.global.persistence.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolume
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}-config
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}-config
- chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
- name: {{ include "common.fullname" . }}
-spec:
- capacity:
- storage: {{ .Values.persistence.config.size}}
- accessModes:
- - {{ .Values.persistence.config.accessMode }}
- persistentVolumeReclaimPolicy: {{ .Values.persistence.config.volumeReclaimPolicy }}
- hostPath:
- path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.config.mountSubPath }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
- storageClassName: ""
-{{- else }}
- storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end }}
----
-{{- if and .Values.global.persistence.enabled (not .Values.persistence.logs.existingClaim) }}
-kind: PersistentVolume
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}-logs
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}-logs
- chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
- name: {{ include "common.fullname" . }}
-spec:
- capacity:
- storage: {{ .Values.persistence.logs.size}}
- accessModes:
- - {{ .Values.persistence.logs.accessMode }}
- persistentVolumeReclaimPolicy: {{ .Values.persistence.logs.volumeReclaimPolicy }}
- hostPath:
- path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.logs.mountSubPath }}
-{{- if .Values.persistence.logs.storageClass }}
-{{- if (eq "-" .Values.persistence.logs.storageClass) }}
- storageClassName: ""
-{{- else }}
- storageClassName: "{{ .Values.persistence.logs.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end }} \ No newline at end of file
diff --git a/kubernetes/aaf/templates/pvc.yaml b/kubernetes/aaf/templates/pvc.yaml
deleted file mode 100644
index a9c8b908eb..0000000000
--- a/kubernetes/aaf/templates/pvc.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-{{- if and .Values.global.persistence.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}-config
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}-config
- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
-{{- if .Values.persistence.config.annotations }}
- annotations:
-{{ toYaml .Values.persistence.config.annotations | indent 4 }}
-{{- end }}
-spec:
- selector:
- matchLabels:
- app: {{ include "common.name" . }}-config
- accessModes:
- - {{ .Values.persistence.config.accessMode }}
- resources:
- requests:
- storage: {{ .Values.persistence.config.size }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
- storageClassName: ""
-{{- else }}
- storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end }}
----
-{{- if and .Values.global.persistence.enabled (not .Values.persistence.logs.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
- name: {{ .Release.Name }}-logs
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}-logs
- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
-{{- if .Values.persistence.logs.annotations }}
- annotations:
-{{ toYaml .Values.persistence.logs.annotations | indent 4 }}
-{{- end }}
-spec:
- selector:
- matchLabels:
- app: {{ include "common.name" . }}-logs
- accessModes:
- - {{ .Values.persistence.logs.accessMode }}
- resources:
- requests:
- storage: {{ .Values.persistence.logs.size }}
-{{- if .Values.persistence.logs.storageClass }}
-{{- if (eq "-" .Values.persistence.logs.storageClass) }}
- storageClassName: ""
-{{- else }}
- storageClassName: "{{ .Values.persistence.logs.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}} \ No newline at end of file
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 258aec5a9a..d53fe9db21 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -21,6 +21,7 @@ global:
readinessImage: readiness-check:2.0.0
ubuntuInitRepository: registry.hub.docker.com
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ configImage: onap/aaf/aaf_config:2.1.5-SNAPSHOT
persistence:
enabled: true
@@ -29,16 +30,13 @@ global:
cadi_latitude: "38.0"
cadi_longitude: "-72.0"
aaf_env: "DEV"
- aaf_register_as: "aaf.onap"
- cassandraServiceName: aaf-cass
- locateServiceName: aaf-locate
+ cass_host: "aaf-cass.onap"
+ cadi_locator_as: "aaf-locate.onap"
#################################################################
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-aaf_config:
- image: onap/aaf/aaf_config:2.1.4-SNAPSHOT
flavor: small
# default number of instances
@@ -92,4 +90,4 @@ aaf-cs:
size: 10Gi
storageClass: "manual"
-resources: {} \ No newline at end of file
+resources: {}