summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aaf')
-rw-r--r--kubernetes/aaf/components/aaf-cass/requirements.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-cass/templates/deployment.yaml4
-rw-r--r--kubernetes/aaf/components/aaf-cass/values.yaml12
-rw-r--r--kubernetes/aaf/components/aaf-cm/requirements.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-cm/values.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-fs/requirements.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-fs/values.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-gui/requirements.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-gui/values.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-hello/requirements.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-hello/templates/deployment.yaml2
-rw-r--r--kubernetes/aaf/components/aaf-locate/requirements.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-locate/values.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-oauth/requirements.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-oauth/values.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-service/requirements.yaml3
-rw-r--r--kubernetes/aaf/components/aaf-service/values.yaml13
-rw-r--r--kubernetes/aaf/components/aaf-sms/Makefile51
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/Makefile51
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/resources/config/config.json (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/configmap.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/pv.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/statefulset.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml)4
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/values.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/values.yaml)4
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/Chart.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/configmap.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/pv.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/service.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/service.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/statefulset.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml)6
-rw-r--r--kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/values.yaml (renamed from kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/values.yaml)1
-rw-r--r--kubernetes/aaf/components/aaf-sms/requirements.yaml9
-rw-r--r--kubernetes/aaf/components/aaf-sms/templates/deployment.yaml8
-rw-r--r--kubernetes/aaf/components/aaf-sms/templates/job.yaml6
-rw-r--r--kubernetes/aaf/components/aaf-sms/values.yaml4
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/Makefile51
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/Makefile51
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/configmap.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml)2
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/deployment.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/deployment.yaml)16
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/job.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml)4
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/values.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml)8
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/configmap.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml)6
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/job.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml)10
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/pv.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml)2
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/pvc.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml)2
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/values.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml)3
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml)0
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml21
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/templates/job.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml)12
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/values.yaml (renamed from kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml)9
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/requirements.yaml15
-rw-r--r--kubernetes/aaf/components/aaf-sshsm/values.yaml25
-rw-r--r--kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl2
-rw-r--r--kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl6
-rw-r--r--kubernetes/aaf/values.yaml16
61 files changed, 428 insertions, 183 deletions
diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml
index 9cf405b818..26bc7a64d8 100644
--- a/kubernetes/aaf/components/aaf-cass/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cass/requirements.yaml
@@ -16,3 +16,6 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
index 30e25269cd..4dc508fa7c 100644
--- a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
+++ b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
- |
chown -R 1000:1000 /opt/app/aaf/status
chown -R 1000:1000 /var/lib/cassandra
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /var/lib/cassandra
@@ -47,7 +47,7 @@ spec:
memory: 100Mi
containers:
- name: {{ include "common.name" . }}
- image: {{ include "common.repository" . }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
# 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"]
diff --git a/kubernetes/aaf/components/aaf-cass/values.yaml b/kubernetes/aaf/components/aaf-cass/values.yaml
index f4d1d2eef0..525674434e 100644
--- a/kubernetes/aaf/components/aaf-cass/values.yaml
+++ b/kubernetes/aaf/components/aaf-cass/values.yaml
@@ -14,22 +14,10 @@
# limitations under the License.
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
flavor: small
diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
index 5f07f2792f..975804b250 100644
--- a/kubernetes/aaf/components/aaf-cm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml
@@ -16,6 +16,9 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: aaf-templates
version: ~6.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-cm/values.yaml b/kubernetes/aaf/components/aaf-cm/values.yaml
index e75abafb0e..964b5c1002 100644
--- a/kubernetes/aaf/components/aaf-cm/values.yaml
+++ b/kubernetes/aaf/components/aaf-cm/values.yaml
@@ -15,24 +15,13 @@
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
aaf:
+ image: onap/aaf/aaf_core:2.1.23
config:
image: onap/aaf/aaf_config:2.1.23
diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml
index 5f07f2792f..01d64d9db8 100644
--- a/kubernetes/aaf/components/aaf-fs/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-fs/requirements.yaml
@@ -16,6 +16,9 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: aaf-templates
version: ~6.x-0
- repository: 'file://../aaf-templates'
+ repository: 'file://../aaf-templates' \ No newline at end of file
diff --git a/kubernetes/aaf/components/aaf-fs/values.yaml b/kubernetes/aaf/components/aaf-fs/values.yaml
index c3750d4449..e911a10828 100644
--- a/kubernetes/aaf/components/aaf-fs/values.yaml
+++ b/kubernetes/aaf/components/aaf-fs/values.yaml
@@ -15,24 +15,13 @@
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
aaf:
+ image: onap/aaf/aaf_core:2.1.23
config:
image: onap/aaf/aaf_config:2.1.23
diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml
index 8c4ee7e0c3..4ed52faa0a 100644
--- a/kubernetes/aaf/components/aaf-gui/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-gui/requirements.yaml
@@ -16,6 +16,9 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: aaf-templates
version: ~6.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-gui/values.yaml b/kubernetes/aaf/components/aaf-gui/values.yaml
index 247b1b5042..e239e615ed 100644
--- a/kubernetes/aaf/components/aaf-gui/values.yaml
+++ b/kubernetes/aaf/components/aaf-gui/values.yaml
@@ -15,24 +15,13 @@
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
aaf:
+ image: onap/aaf/aaf_core:2.1.23
config:
image: onap/aaf/aaf_config:2.1.23
diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
index 8c4ee7e0c3..4ed52faa0a 100644
--- a/kubernetes/aaf/components/aaf-hello/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml
@@ -16,6 +16,9 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: aaf-templates
version: ~6.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml
index c25cc0b0b0..60e7c6bcc8 100644
--- a/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml
+++ b/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
containers:
- name: {{ include "common.name" . }}
command: ["bash","-c","cd /opt/app/aaf && if [ ! -d /opt/app/osaaf/etc ]; then cp -Rf etc logs /opt/app/osaaf; fi && exec bin/hello"]
- image: {{ .Values.global.repository }}/{{.Values.image }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{.Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 10 }}
volumeMounts: {{ include "common.aaf-config-volume-mountpath" . | nindent 8 }}
diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml
index 8c4ee7e0c3..4ed52faa0a 100644
--- a/kubernetes/aaf/components/aaf-locate/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-locate/requirements.yaml
@@ -16,6 +16,9 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: aaf-templates
version: ~6.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-locate/values.yaml b/kubernetes/aaf/components/aaf-locate/values.yaml
index e74893cd49..0a3e4d432b 100644
--- a/kubernetes/aaf/components/aaf-locate/values.yaml
+++ b/kubernetes/aaf/components/aaf-locate/values.yaml
@@ -15,24 +15,13 @@
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
aaf:
+ image: onap/aaf/aaf_core:2.1.23
config:
image: onap/aaf/aaf_config:2.1.23
diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
index 8c4ee7e0c3..4ed52faa0a 100644
--- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
@@ -16,6 +16,9 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: aaf-templates
version: ~6.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-oauth/values.yaml b/kubernetes/aaf/components/aaf-oauth/values.yaml
index aad63df68a..2e9b6d42fa 100644
--- a/kubernetes/aaf/components/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/values.yaml
@@ -15,24 +15,13 @@
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
aaf:
+ image: onap/aaf/aaf_core:2.1.23
config:
image: onap/aaf/aaf_config:2.1.23
diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml
index 8c4ee7e0c3..4ed52faa0a 100644
--- a/kubernetes/aaf/components/aaf-service/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-service/requirements.yaml
@@ -16,6 +16,9 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: aaf-templates
version: ~6.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-service/values.yaml b/kubernetes/aaf/components/aaf-service/values.yaml
index 2fd8a3bcd5..8d8da0db4a 100644
--- a/kubernetes/aaf/components/aaf-service/values.yaml
+++ b/kubernetes/aaf/components/aaf-service/values.yaml
@@ -15,24 +15,13 @@
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
aaf:
+ image: onap/aaf/aaf_core:2.1.23
config:
image: onap/aaf/aaf_config:2.1.23
diff --git a/kubernetes/aaf/components/aaf-sms/Makefile b/kubernetes/aaf/components/aaf-sms/Makefile
new file mode 100644
index 0000000000..4c79718d02
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sms/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES := dist resources templates charts docker
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/aaf/components/aaf-sms/components/Makefile b/kubernetes/aaf/components/aaf-sms/components/Makefile
new file mode 100644
index 0000000000..bf267b7720
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sms/components/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES :=
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
index 2dc3d49b66..2dc3d49b66 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
new file mode 100644
index 0000000000..26bc7a64d8
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml
@@ -0,0 +1,21 @@
+ # Copyright © 2020 Orange
+#
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/resources/config/config.json
index 3a43f00019..3a43f00019 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/resources/config/config.json
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/configmap.yaml
index 471c9094aa..471c9094aa 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/configmap.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/pv.yaml
index d855ae6fdf..d855ae6fdf 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/pv.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/statefulset.yaml
index c72d9e0422..0e9e66dc47 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/templates/statefulset.yaml
@@ -49,14 +49,14 @@ spec:
- |
chmod -R 775 /quorumclient/auth
chown -R 100:1000 /quorumclient/auth
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /quorumclient/auth
name: {{ include "common.fullname" . }}-data
{{- end }}
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/quorumclient/bin/quorumclient"]
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/values.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/values.yaml
index 1459624536..d41d31ce82 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/values.yaml
@@ -23,7 +23,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/aaf/smsquorumclient:4.0.2
pullPolicy: Always
@@ -39,6 +38,9 @@ nodeSelector: {}
affinity: {}
+service:
+ name: aaf-sms
+
persistence:
enabled: true
volumeReclaimPolicy: Retain
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
index 074958ff70..074958ff70 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
new file mode 100644
index 0000000000..26bc7a64d8
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml
@@ -0,0 +1,21 @@
+ # Copyright © 2020 Orange
+#
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/configmap.yaml
index 0d09221644..0d09221644 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/configmap.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/pv.yaml
index d855ae6fdf..d855ae6fdf 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/pv.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/service.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/service.yaml
index b642e39540..b642e39540 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/service.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/statefulset.yaml
index 3e580eca41..994e1555d3 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/templates/statefulset.yaml
@@ -47,14 +47,14 @@ spec:
- |
chmod -R 775 /consul/data
chown -R 100:1000 /consul/data
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /consul/data
name: {{ include "common.fullname" . }}-data
{{- end }}
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image.vault }}"
+ - image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.vault }}
name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
args: ["server"]
@@ -69,7 +69,7 @@ spec:
readOnly: true
resources:
{{ include "common.resources" . | indent 10 }}
- - image: "{{ include "common.repository" . }}/{{ .Values.image.consul }}"
+ - image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.consul }}
name: {{ include "common.name" . }}-backend
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
args: ["agent","-server","-bind","0.0.0.0","-bootstrap-expect=1","-config-file","/consul/config/config.json"]
diff --git a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/values.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/values.yaml
index 7787f0b85d..750363c8f4 100644
--- a/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/values.yaml
@@ -20,7 +20,6 @@ global:
persistence: {}
# application image
-repository: nexus3.onap.org:10001
image:
consul: library/consul:1.7.1
vault: library/vault:1.3.3
diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml
index 3c13433ee1..58a9a0dd26 100644
--- a/kubernetes/aaf/components/aaf-sms/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sms/requirements.yaml
@@ -16,6 +16,15 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
- name: certInitializer
version: ~6.x-0
repository: '@local'
+ - name: aaf-sms-quorumclient
+ version: ~6.x-0
+ repository: 'file://components/aaf-sms-quorumclient'
+ - name: aaf-sms-vault
+ version: ~6.x-0
+ repository: 'file://components/aaf-sms-vault'
diff --git a/kubernetes/aaf/components/aaf-sms/templates/deployment.yaml b/kubernetes/aaf/components/aaf-sms/templates/deployment.yaml
index 782895e87f..cfe54cf07b 100644
--- a/kubernetes/aaf/components/aaf-sms/templates/deployment.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
- -c
- |
cat /int-certs/intermediate_root_ca.pem >> {{ .Values.certInitializer.mountPath }}/local/org.onap.aaf-sms.crt
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 12 }}
- mountPath: /int-certs
@@ -62,13 +62,13 @@ spec:
- |
chmod -R 775 /sms/auth
chown -R 1000:1000 /sms/auth
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /sms/auth
name: {{ include "common.fullname" . }}-auth
- name: {{ include "common.name" . }}-readiness
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -84,7 +84,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}
command: ["/sms/bin/sms"]
diff --git a/kubernetes/aaf/components/aaf-sms/templates/job.yaml b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
index 3650990b99..1341889af3 100644
--- a/kubernetes/aaf/components/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
@@ -136,10 +136,10 @@ spec:
name: {{ include "common.name" . }}-preload-input
- mountPath: /config/
name: {{ include "common.name" . }}-preload
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
- - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ - image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
command:
@@ -156,7 +156,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-preload
command:
diff --git a/kubernetes/aaf/components/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml
index 148d10da13..3b777c64f6 100644
--- a/kubernetes/aaf/components/aaf-sms/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/values.yaml
@@ -18,10 +18,7 @@
#################################################################
global:
nodePortPrefix: 302
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
persistence: {}
- envsubstImage: dibi/envsubst
aafEnabled: true
flavor: small
@@ -58,7 +55,6 @@ certInitializer:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/aaf/sms:4.0.2
pullPolicy: Always
diff --git a/kubernetes/aaf/components/aaf-sshsm/Makefile b/kubernetes/aaf/components/aaf-sshsm/Makefile
new file mode 100644
index 0000000000..4c79718d02
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sshsm/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES := dist resources templates charts docker
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/Makefile b/kubernetes/aaf/components/aaf-sshsm/components/Makefile
new file mode 100644
index 0000000000..bf267b7720
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sshsm/components/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES :=
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
index 499b82caaf..499b82caaf 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
new file mode 100644
index 0000000000..771a327656
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml
@@ -0,0 +1,21 @@
+# Copyright 2018 Intel Corporation, Inc
+#
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/configmap.yaml
index 99176fcdf6..8555a3c153 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/configmap.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-{{- if .Values.global.distcenter.enabled -}}
+{{- if .Values.global.tpm.enabled -}}
apiVersion: v1
kind: ConfigMap
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/deployment.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/deployment.yaml
index 2715120ba9..a2df4e53b9 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/deployment.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/deployment.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-{{- if and .Values.global.tpm.enabled .Values.global.abrmd.enabled -}}
+{{- if .Values.global.tpm.enabled -}}
apiVersion: apps/v1
kind: Deployment
@@ -27,7 +27,7 @@ spec:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
initContainers:
- - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ - image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-job-complete
command:
@@ -49,7 +49,7 @@ spec:
cpu: 3m
memory: 20Mi
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/abrmd/bin/run_abrmd.sh"]
@@ -67,14 +67,14 @@ spec:
resources: {{ include "common.resources" . | nindent 10 }}
nodeSelector:
{{- if .Values.nodeSelector }}
-{{ toYaml .Values.nodeSelector | indent 8 }}
- {{- end -}}
+ {{ toYaml .Values.nodeSelector | indent 8 | trim }}
+ {{- end }}
{{- if .Values.global.tpm.enabled }}
{{ (printf "%s: \"%s\"" .Values.global.tpm.nodeLabel .Values.global.tpm.nodeLabelValue) }}
- {{- end -}}
- {{- if .Values.affinity }}
- affinity: {{ toYaml .Values.affinity | nindent 8 }}
{{- end }}
+ {{- if .Values.affinity }}
+ affinity: {{ toYaml .Values.affinity | nindent 8 }}
+ {{- end }}
volumes:
- name: localtime
hostPath:
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/job.yaml
index 90d18997ac..8a8b6bd8fe 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/templates/job.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-{{- if and .Values.global.tpm.enabled .Values.global.abrmd.enabled -}}
+{{- if .Values.global.tpm.enabled -}}
apiVersion: batch/v1
kind: Job
@@ -27,7 +27,7 @@ spec:
restartPolicy: Never
containers:
- name: {{ include "common.name" . }}-job
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/abrmd/bin/initialize_tpm.sh"]
workingDir: /abrmd/bin
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/values.yaml
index 2a733632bf..e97519aa3e 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/values.yaml
@@ -15,12 +15,18 @@
#################################################################
# Global configuration defaults.
#################################################################
+global:
+ tpm:
+ enabled: true
+ # if enabled, nodeselector will use the below
+ # values in the nodeselector section of the pod
+ nodeLabel: "tpm-node"
+ nodeLabelValue: "true"
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/aaf/abrmd:4.0.0
pullPolicy: Always
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
index 22ba3da019..22ba3da019 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
new file mode 100644
index 0000000000..771a327656
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml
@@ -0,0 +1,21 @@
+# Copyright 2018 Intel Corporation, Inc
+#
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/configmap.yaml
index 8d1faf7e32..2e82f5bd26 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/configmap.yaml
@@ -14,12 +14,8 @@
# limitations under the License.
*/}}
-{{- if and .Values.global.tpm.enabled .Values.global.abrmd.enabled -}}
-
apiVersion: v1
kind: ConfigMap
metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
-
-{{- end -}}
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} \ No newline at end of file
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/job.yaml
index c40c6b075a..f74b5c8f2d 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/job.yaml
@@ -14,8 +14,6 @@
# limitations under the License.
*/}}
-{{- if .Values.global.distcenter.enabled -}}
-
apiVersion: batch/v1
kind: Job
metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
@@ -27,7 +25,7 @@ spec:
restartPolicy: Never
initContainers:
{{- if .Values.global.tpm.enabled }}
- - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ - image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
command:
@@ -49,7 +47,7 @@ spec:
cpu: 3m
memory: 20Mi
{{ else }}
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-gen-passphrase
command: ["sh", "-c", "/usr/bin/openssl rand -base64 12 >/distcenter/data/passphrase"]
@@ -74,7 +72,7 @@ spec:
memory: 20Mi
{{- end }}
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/entrypoint.sh"]
@@ -101,5 +99,3 @@ spec:
claimName: {{ include "common.release" . }}-aaf-sshsm
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
-
-{{- end -}}
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/pv.yaml
index bf0ef74be2..22acb2a609 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/pv.yaml
@@ -14,6 +14,4 @@
# limitations under the License.
*/}}
-{{- if .Values.global.distcenter.enabled -}}
{{ include "common.PV" . }}
-{{- end -}}
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/pvc.yaml
index a13b7f353b..1c7f6ffe4a 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/templates/pvc.yaml
@@ -14,6 +14,4 @@
# limitations under the License.
*/}}
-{{- if .Values.global.distcenter.enabled -}}
{{ include "common.PVC" . }}
-{{- end -}}
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/values.yaml
index 94791be713..fb42843cb7 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/values.yaml
@@ -17,12 +17,13 @@
#################################################################
global:
persistence: {}
+ tpm:
+ enabled: true
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/aaf/distcenter:4.0.0
pullPolicy: Always
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
index b64e0c331a..b64e0c331a 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
new file mode 100644
index 0000000000..771a327656
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml
@@ -0,0 +1,21 @@
+# Copyright 2018 Intel Corporation, Inc
+#
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/templates/job.yaml
index 021276b06d..71e7c299bc 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/templates/job.yaml
@@ -14,8 +14,6 @@
# limitations under the License.
*/}}
-{{- if .Values.global.testca.enabled -}}
-
apiVersion: batch/v1
kind: Job
metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
@@ -25,7 +23,7 @@ spec:
spec:
restartPolicy: Never
initContainers:
- - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ - image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-distcenter-ready
command:
@@ -47,7 +45,7 @@ spec:
cpu: 3m
memory: 20Mi
{{- if .Values.global.tpm.enabled }}
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-abrmd-ready
command: ["sh", "/sshsm/bin/abrmd_ready.sh", "300"]
@@ -70,7 +68,7 @@ spec:
memory: 20Mi
{{- end }}
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
name: {{ include "common.name" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["./import.sh"]
@@ -103,7 +101,7 @@ spec:
resources: {{ include "common.resources" . | nindent 10 }}
nodeSelector:
{{- if .Values.nodeSelector }}
-{{ toYaml .Values.nodeSelector | indent 8 }}
+ {{ toYaml .Values.nodeSelector | indent 8 | trim }}
{{- end -}}
{{- if .Values.global.tpm.enabled }}
{{ (printf "%s: \"%s\"" .Values.global.tpm.nodeLabel .Values.global.tpm.nodeLabelValue) }}
@@ -126,5 +124,3 @@ spec:
secretName: {{ include "common.release" . }}-aaf-sshsm
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
-
-{{- end -}}
diff --git a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/values.yaml
index dd04c93bd7..f116c6d5e9 100644
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/values.yaml
@@ -16,13 +16,18 @@
# Global configuration defaults.
#################################################################
-enabled: true
+global:
+ tpm:
+ enabled: true
+ # if enabled, nodeselector will use the below
+ # values in the nodeselector section of the pod
+ nodeLabel: "tpm-node"
+ nodeLabelValue: "true"
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/aaf/testcaservice:4.0.0
pullPolicy: Always
diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
index 0704a2c9df..bb76d59c04 100644
--- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
@@ -16,3 +16,18 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-sshsm-abrmd
+ version: ~6.x-0
+ repository: 'file://components/aaf-sshsm-abrmd'
+ condition: aaf-sshsm-abrmd.enabled
+ - name: aaf-sshsm-distcenter
+ version: ~6.x-0
+ repository: 'file://components/aaf-sshsm-distcenter'
+ condition: aaf-sshsm-distcenter.enabled
+ - name: aaf-sshsm-testca
+ version: ~6.x-0
+ repository: 'file://components/aaf-sshsm-testca'
+ condition: aaf-sshsm-testca.testca.enabled
diff --git a/kubernetes/aaf/components/aaf-sshsm/values.yaml b/kubernetes/aaf/components/aaf-sshsm/values.yaml
index eee2bcf0aa..7e8d4f1352 100644
--- a/kubernetes/aaf/components/aaf-sshsm/values.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/values.yaml
@@ -18,20 +18,8 @@
#################################################################
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
tpm:
enabled: false
@@ -39,14 +27,15 @@ global:
# values in the nodeselector section of the pod
nodeLabel: "tpm-node"
nodeLabelValue: "true"
- abrmd:
- enabled: true
- distcenter:
- enabled: true
- testca:
- enabled: true
persistence: {}
+aaf-sshsm-abrmd:
+ enabled: true
+aaf-sshsm-distcenter:
+ enabled: true
+aaf-sshsm-testca:
+ enabled: true
+
persistence:
enabled: true
data:
diff --git a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
index 00b44a0455..afa5004a48 100644
--- a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
+++ b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
@@ -28,7 +28,7 @@ spec:
- name: {{ include "common.name" . }}
workingDir: /opt/app/aaf
command: ["bin/{{ .Values.binary }}"]
- image: {{ include "common.repository" . }}/{{.Values.global.aaf.image}}
+ image: {{ include "repositoryGenerator.repository" . }}/{{.Values.global.aaf.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 10 }}
volumeMounts:
diff --git a/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl b/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
index 69d954af77..7cdf4d072e 100644
--- a/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
+++ b/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
@@ -23,7 +23,7 @@
- |
chown -R 1000:1000 /opt/app/aaf
chown -R 1000:1000 /opt/app/osaaf
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /opt/app/osaaf
@@ -39,7 +39,7 @@
{{- define "aaf.podConfiguration" }}
- name: {{ include "common.name" . }}-config-container
- image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
+ image: {{ include "repositoryGenerator.repository" . }}/{{.Values.global.aaf.config.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /bin/bash
@@ -108,7 +108,7 @@ initContainers:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
limits:
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index df6aff5a04..9d032b599a 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -20,26 +20,10 @@
global:
nodePortPrefix: 302
- # Readiness image
- readinessImage: onap/oom/readiness:3.0.1
- # Ubuntu Init image
- ubuntuInitRepository: docker.io
- ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
- # Logging image
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- # BusyBox image
- busyboxRepository: docker.io
- busyboxImage: library/busybox:1.31
persistence:
enabled: true
# Standard OOM
pullPolicy: "Always"
- repository: "nexus3.onap.org:10001"
-
- # Use Local
- #pullPolicy: IfNotPresent
- #repository: "nexus3.onap.org:10003"
cmpv2Enabled: true
addTestingComponents: false