[AAF SMS] Use certInitializer for certificates
AAF SMS was hardcoding its certificates in the container.
This patch makes use of certInitializer in order to retrieve "fresh"
certificates.
In order to use certInitiliazer in a sub component, we had to move
charts to component and add the right requirements.
Issue-ID: AAF-1159
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I6ec55eddffd54dd56b03cea1a6f0b437f8bfa299
diff --git a/docs/oom_hardcoded_certificates.rst b/docs/oom_hardcoded_certificates.rst
index 46d74cd..085beaa 100644
--- a/docs/oom_hardcoded_certificates.rst
+++ b/docs/oom_hardcoded_certificates.rst
@@ -16,6 +16,8 @@
+==================+==================+==================+============================================================================================+
| AAF | No | Yes | No | aaf/charts/aaf-cert-service/resources/ |
+------------------+------------------+------------------+--------------------------------------------------------------------------------------------+
+ | AAF | Yes | No | No | aaf/components/aaf-sms/resources/certs/intermediate_root_ca.pem |
+ +------------------+------------------+------------------+--------------------------------------------------------------------------------------------+
| AAI | Yes | No | No | aai/oom/resources/config/haproxy/aai.pem |
+------------------+------------------+------------------+--------------------------------------------------------------------------------------------+
| AAI | Yes | No | No | aai/oom/resources/config/aai/aai_keystore |
diff --git a/kubernetes/aaf/Makefile b/kubernetes/aaf/Makefile
new file mode 100644
index 0000000..9396001
--- /dev/null
+++ b/kubernetes/aaf/Makefile
@@ -0,0 +1,50 @@
+# Copyright © 2020 Samsung Electronics, 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.
+
+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
+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 dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+ @helm repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/aaf/components/Makefile b/kubernetes/aaf/components/Makefile
new file mode 100644
index 0000000..2fc0cbe
--- /dev/null
+++ b/kubernetes/aaf/components/Makefile
@@ -0,0 +1,50 @@
+# 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_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 dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then helm lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then helm package -d $(PACKAGE_DIR) $*; fi
+ @helm repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/aaf/charts/aaf-cass/.helmignore b/kubernetes/aaf/components/aaf-cass/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cass/.helmignore
rename to kubernetes/aaf/components/aaf-cass/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cass/Chart.yaml
rename to kubernetes/aaf/components/aaf-cass/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml
similarity index 83%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-cass/requirements.yaml
index 34932b7..6afaa06 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-cass/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,8 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/charts/aaf-cass/templates/NOTES.txt b/kubernetes/aaf/components/aaf-cass/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cass/templates/NOTES.txt
rename to kubernetes/aaf/components/aaf-cass/templates/NOTES.txt
diff --git a/kubernetes/aaf/charts/aaf-cass/templates/deployment.yaml b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cass/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-cass/templates/pv.yaml b/kubernetes/aaf/components/aaf-cass/templates/pv.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cass/templates/pv.yaml
rename to kubernetes/aaf/components/aaf-cass/templates/pv.yaml
diff --git a/kubernetes/aaf/charts/aaf-cass/templates/pvc.yaml b/kubernetes/aaf/components/aaf-cass/templates/pvc.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cass/templates/pvc.yaml
rename to kubernetes/aaf/components/aaf-cass/templates/pvc.yaml
diff --git a/kubernetes/aaf/charts/aaf-cass/templates/service.yaml b/kubernetes/aaf/components/aaf-cass/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cass/templates/service.yaml
rename to kubernetes/aaf/components/aaf-cass/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-cass/values.yaml b/kubernetes/aaf/components/aaf-cass/values.yaml
similarity index 78%
rename from kubernetes/aaf/charts/aaf-cass/values.yaml
rename to kubernetes/aaf/components/aaf-cass/values.yaml
index ec7dcbb..c5e5811 100644
--- a/kubernetes/aaf/charts/aaf-cass/values.yaml
+++ b/kubernetes/aaf/components/aaf-cass/values.yaml
@@ -12,6 +12,25 @@
# 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.
+global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
flavor: small
diff --git a/kubernetes/aaf/charts/aaf-cert-service/.helmignore b/kubernetes/aaf/components/aaf-cert-service/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/.helmignore
rename to kubernetes/aaf/components/aaf-cert-service/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-cert-service/Chart.yaml b/kubernetes/aaf/components/aaf-cert-service/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/Chart.yaml
rename to kubernetes/aaf/components/aaf-cert-service/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-cert-service/requirements.yaml
similarity index 83%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-cert-service/requirements.yaml
index 34932b7..6afaa06 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-cert-service/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,8 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/charts/aaf-cert-service/resources/certServiceClient-keystore.jks b/kubernetes/aaf/components/aaf-cert-service/resources/certServiceClient-keystore.jks
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/resources/certServiceClient-keystore.jks
rename to kubernetes/aaf/components/aaf-cert-service/resources/certServiceClient-keystore.jks
Binary files differ
diff --git a/kubernetes/aaf/charts/aaf-cert-service/resources/certServiceServer-keystore.jks b/kubernetes/aaf/components/aaf-cert-service/resources/certServiceServer-keystore.jks
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/resources/certServiceServer-keystore.jks
rename to kubernetes/aaf/components/aaf-cert-service/resources/certServiceServer-keystore.jks
Binary files differ
diff --git a/kubernetes/aaf/charts/aaf-cert-service/resources/certServiceServer-keystore.p12 b/kubernetes/aaf/components/aaf-cert-service/resources/certServiceServer-keystore.p12
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/resources/certServiceServer-keystore.p12
rename to kubernetes/aaf/components/aaf-cert-service/resources/certServiceServer-keystore.p12
Binary files differ
diff --git a/kubernetes/aaf/charts/aaf-cert-service/resources/default/cmpServers.json b/kubernetes/aaf/components/aaf-cert-service/resources/default/cmpServers.json
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/resources/default/cmpServers.json
rename to kubernetes/aaf/components/aaf-cert-service/resources/default/cmpServers.json
diff --git a/kubernetes/aaf/charts/aaf-cert-service/resources/root.crt b/kubernetes/aaf/components/aaf-cert-service/resources/root.crt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/resources/root.crt
rename to kubernetes/aaf/components/aaf-cert-service/resources/root.crt
diff --git a/kubernetes/aaf/charts/aaf-cert-service/resources/test/cmpServers.json b/kubernetes/aaf/components/aaf-cert-service/resources/test/cmpServers.json
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/resources/test/cmpServers.json
rename to kubernetes/aaf/components/aaf-cert-service/resources/test/cmpServers.json
diff --git a/kubernetes/aaf/charts/aaf-cert-service/resources/truststore.jks b/kubernetes/aaf/components/aaf-cert-service/resources/truststore.jks
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/resources/truststore.jks
rename to kubernetes/aaf/components/aaf-cert-service/resources/truststore.jks
Binary files differ
diff --git a/kubernetes/aaf/charts/aaf-cert-service/templates/deployment.yaml b/kubernetes/aaf/components/aaf-cert-service/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-cert-service/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-cert-service/templates/secret.yaml b/kubernetes/aaf/components/aaf-cert-service/templates/secret.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/templates/secret.yaml
rename to kubernetes/aaf/components/aaf-cert-service/templates/secret.yaml
diff --git a/kubernetes/aaf/charts/aaf-cert-service/templates/service.yaml b/kubernetes/aaf/components/aaf-cert-service/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cert-service/templates/service.yaml
rename to kubernetes/aaf/components/aaf-cert-service/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-cert-service/values.yaml b/kubernetes/aaf/components/aaf-cert-service/values.yaml
similarity index 87%
rename from kubernetes/aaf/charts/aaf-cert-service/values.yaml
rename to kubernetes/aaf/components/aaf-cert-service/values.yaml
index c2bbecd..17b0b75 100644
--- a/kubernetes/aaf/charts/aaf-cert-service/values.yaml
+++ b/kubernetes/aaf/components/aaf-cert-service/values.yaml
@@ -1,5 +1,5 @@
# Copyright © 2020, Nokia
-# Modifications Copyright © 2020, Nordix Foundation
+# Modifications Copyright © 2020, Nordix Foundation, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,6 +16,25 @@
# Global
global:
envsubstImage: dibi/envsubst
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
# Service configuration
service:
diff --git a/kubernetes/aaf/charts/aaf-cm/.helmignore b/kubernetes/aaf/components/aaf-cm/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cm/.helmignore
rename to kubernetes/aaf/components/aaf-cm/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cm/Chart.yaml
rename to kubernetes/aaf/components/aaf-cm/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml
similarity index 73%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-cm/requirements.yaml
index 34932b7..08ef7fe 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~6.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/NOTES.txt b/kubernetes/aaf/components/aaf-cm/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cm/templates/NOTES.txt
rename to kubernetes/aaf/components/aaf-cm/templates/NOTES.txt
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml b/kubernetes/aaf/components/aaf-cm/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cm/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-cm/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/ingress.yaml b/kubernetes/aaf/components/aaf-cm/templates/ingress.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cm/templates/ingress.yaml
rename to kubernetes/aaf/components/aaf-cm/templates/ingress.yaml
diff --git a/kubernetes/aaf/charts/aaf-cm/templates/service.yaml b/kubernetes/aaf/components/aaf-cm/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-cm/templates/service.yaml
rename to kubernetes/aaf/components/aaf-cm/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/components/aaf-cm/values.yaml
similarity index 72%
rename from kubernetes/aaf/charts/aaf-cm/values.yaml
rename to kubernetes/aaf/components/aaf-cm/values.yaml
index c391369..0997c7d 100644
--- a/kubernetes/aaf/charts/aaf-cm/values.yaml
+++ b/kubernetes/aaf/components/aaf-cm/values.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications © 2020 AT&T
+# Modifications © 2020 AT&T, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,6 +13,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
+ aaf:
+ config:
+ image: onap/aaf/aaf_config:2.1.23
+
+
flavor: small
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-fs/.helmignore b/kubernetes/aaf/components/aaf-fs/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-fs/.helmignore
rename to kubernetes/aaf/components/aaf-fs/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-fs/Chart.yaml
rename to kubernetes/aaf/components/aaf-fs/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml
similarity index 73%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-fs/requirements.yaml
index 34932b7..08ef7fe 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-fs/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~6.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/NOTES.txt b/kubernetes/aaf/components/aaf-fs/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-fs/templates/NOTES.txt
rename to kubernetes/aaf/components/aaf-fs/templates/NOTES.txt
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml b/kubernetes/aaf/components/aaf-fs/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-fs/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-fs/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/ingress.yaml b/kubernetes/aaf/components/aaf-fs/templates/ingress.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-fs/templates/ingress.yaml
rename to kubernetes/aaf/components/aaf-fs/templates/ingress.yaml
diff --git a/kubernetes/aaf/charts/aaf-fs/templates/service.yaml b/kubernetes/aaf/components/aaf-fs/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-fs/templates/service.yaml
rename to kubernetes/aaf/components/aaf-fs/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-fs/values.yaml b/kubernetes/aaf/components/aaf-fs/values.yaml
similarity index 74%
rename from kubernetes/aaf/charts/aaf-fs/values.yaml
rename to kubernetes/aaf/components/aaf-fs/values.yaml
index 6ddc072..9bffb95 100644
--- a/kubernetes/aaf/charts/aaf-fs/values.yaml
+++ b/kubernetes/aaf/components/aaf-fs/values.yaml
@@ -13,6 +13,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
+ aaf:
+ config:
+ image: onap/aaf/aaf_config:2.1.23
+
flavor: small
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-gui/.helmignore b/kubernetes/aaf/components/aaf-gui/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-gui/.helmignore
rename to kubernetes/aaf/components/aaf-gui/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-gui/Chart.yaml
rename to kubernetes/aaf/components/aaf-gui/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml
similarity index 73%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-gui/requirements.yaml
index 34932b7..08ef7fe 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-gui/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~6.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/NOTES.txt b/kubernetes/aaf/components/aaf-gui/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-gui/templates/NOTES.txt
rename to kubernetes/aaf/components/aaf-gui/templates/NOTES.txt
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml b/kubernetes/aaf/components/aaf-gui/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-gui/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-gui/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/ingress.yaml b/kubernetes/aaf/components/aaf-gui/templates/ingress.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-gui/templates/ingress.yaml
rename to kubernetes/aaf/components/aaf-gui/templates/ingress.yaml
diff --git a/kubernetes/aaf/charts/aaf-gui/templates/service.yaml b/kubernetes/aaf/components/aaf-gui/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-gui/templates/service.yaml
rename to kubernetes/aaf/components/aaf-gui/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-gui/values.yaml b/kubernetes/aaf/components/aaf-gui/values.yaml
similarity index 73%
rename from kubernetes/aaf/charts/aaf-gui/values.yaml
rename to kubernetes/aaf/components/aaf-gui/values.yaml
index f418fd5..8639d6c 100644
--- a/kubernetes/aaf/charts/aaf-gui/values.yaml
+++ b/kubernetes/aaf/components/aaf-gui/values.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications © 2020 AT&T
+# Modifications © 2020 AT&T, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,6 +13,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
+ aaf:
+ config:
+ image: onap/aaf/aaf_config:2.1.23
+
flavor: small
#################################################################
# Application configuration defaults.
diff --git a/kubernetes/aaf/charts/aaf-hello/.helmignore b/kubernetes/aaf/components/aaf-hello/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/.helmignore
rename to kubernetes/aaf/components/aaf-hello/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/Chart.yaml
rename to kubernetes/aaf/components/aaf-hello/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml
similarity index 73%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-hello/requirements.yaml
index 34932b7..08ef7fe 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~6.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/NOTES.txt b/kubernetes/aaf/components/aaf-hello/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/templates/NOTES.txt
rename to kubernetes/aaf/components/aaf-hello/templates/NOTES.txt
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-hello/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/ingress.yaml b/kubernetes/aaf/components/aaf-hello/templates/ingress.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/templates/ingress.yaml
rename to kubernetes/aaf/components/aaf-hello/templates/ingress.yaml
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/secret.yaml b/kubernetes/aaf/components/aaf-hello/templates/secret.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/templates/secret.yaml
rename to kubernetes/aaf/components/aaf-hello/templates/secret.yaml
diff --git a/kubernetes/aaf/charts/aaf-hello/templates/service.yaml b/kubernetes/aaf/components/aaf-hello/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/templates/service.yaml
rename to kubernetes/aaf/components/aaf-hello/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/components/aaf-hello/values.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-hello/values.yaml
rename to kubernetes/aaf/components/aaf-hello/values.yaml
diff --git a/kubernetes/aaf/charts/aaf-locate/.helmignore b/kubernetes/aaf/components/aaf-locate/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-locate/.helmignore
rename to kubernetes/aaf/components/aaf-locate/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-locate/Chart.yaml
rename to kubernetes/aaf/components/aaf-locate/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml
similarity index 73%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-locate/requirements.yaml
index 34932b7..08ef7fe 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-locate/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~6.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/NOTES.txt b/kubernetes/aaf/components/aaf-locate/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-locate/templates/NOTES.txt
rename to kubernetes/aaf/components/aaf-locate/templates/NOTES.txt
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml b/kubernetes/aaf/components/aaf-locate/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-locate/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-locate/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml b/kubernetes/aaf/components/aaf-locate/templates/ingress.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-locate/templates/ingress.yaml
rename to kubernetes/aaf/components/aaf-locate/templates/ingress.yaml
diff --git a/kubernetes/aaf/charts/aaf-locate/templates/service.yaml b/kubernetes/aaf/components/aaf-locate/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-locate/templates/service.yaml
rename to kubernetes/aaf/components/aaf-locate/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/components/aaf-locate/values.yaml
similarity index 72%
rename from kubernetes/aaf/charts/aaf-locate/values.yaml
rename to kubernetes/aaf/components/aaf-locate/values.yaml
index 01a5ab1..7bcf10d 100644
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/components/aaf-locate/values.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications © 2020 AT&T
+# Modifications © 2020 AT&T, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,6 +13,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
+ aaf:
+ config:
+ image: onap/aaf/aaf_config:2.1.23
+
+
flavor: small
#################################################################
# Application configuration defaults.
diff --git a/kubernetes/aaf/charts/aaf-oauth/.helmignore b/kubernetes/aaf/components/aaf-oauth/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-oauth/.helmignore
rename to kubernetes/aaf/components/aaf-oauth/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-oauth/Chart.yaml
rename to kubernetes/aaf/components/aaf-oauth/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
similarity index 73%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-oauth/requirements.yaml
index 34932b7..08ef7fe 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~6.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/NOTES.txt b/kubernetes/aaf/components/aaf-oauth/templates/NOTES.txt
similarity index 100%
rename from kubernetes/aaf/charts/aaf-oauth/templates/NOTES.txt
rename to kubernetes/aaf/components/aaf-oauth/templates/NOTES.txt
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml b/kubernetes/aaf/components/aaf-oauth/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-oauth/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-oauth/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/ingress.yaml b/kubernetes/aaf/components/aaf-oauth/templates/ingress.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-oauth/templates/ingress.yaml
rename to kubernetes/aaf/components/aaf-oauth/templates/ingress.yaml
diff --git a/kubernetes/aaf/charts/aaf-oauth/templates/service.yaml b/kubernetes/aaf/components/aaf-oauth/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-oauth/templates/service.yaml
rename to kubernetes/aaf/components/aaf-oauth/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-oauth/values.yaml b/kubernetes/aaf/components/aaf-oauth/values.yaml
similarity index 73%
rename from kubernetes/aaf/charts/aaf-oauth/values.yaml
rename to kubernetes/aaf/components/aaf-oauth/values.yaml
index 7604b86..8771041 100644
--- a/kubernetes/aaf/charts/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/values.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications © 2020 AT&T
+# Modifications © 2020 AT&T, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,6 +13,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
+ aaf:
+ config:
+ image: onap/aaf/aaf_config:2.1.23
+
+
flavor: small
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-service/.helmignore b/kubernetes/aaf/components/aaf-service/.helmignore
similarity index 100%
rename from kubernetes/aaf/charts/aaf-service/.helmignore
rename to kubernetes/aaf/components/aaf-service/.helmignore
diff --git a/kubernetes/aaf/charts/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-service/Chart.yaml
rename to kubernetes/aaf/components/aaf-service/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml
similarity index 73%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-service/requirements.yaml
index 34932b7..08ef7fe 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-service/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: aaf-templates
+ version: ~6.x-0
+ repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/charts/aaf-service/templates/deployment.yaml b/kubernetes/aaf/components/aaf-service/templates/deployment.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-service/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-service/templates/deployment.yaml
diff --git a/kubernetes/aaf/charts/aaf-service/templates/ingress.yaml b/kubernetes/aaf/components/aaf-service/templates/ingress.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-service/templates/ingress.yaml
rename to kubernetes/aaf/components/aaf-service/templates/ingress.yaml
diff --git a/kubernetes/aaf/charts/aaf-service/templates/service.yaml b/kubernetes/aaf/components/aaf-service/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-service/templates/service.yaml
rename to kubernetes/aaf/components/aaf-service/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-service/values.yaml b/kubernetes/aaf/components/aaf-service/values.yaml
similarity index 73%
rename from kubernetes/aaf/charts/aaf-service/values.yaml
rename to kubernetes/aaf/components/aaf-service/values.yaml
index c2d9603..d924bb4 100644
--- a/kubernetes/aaf/charts/aaf-service/values.yaml
+++ b/kubernetes/aaf/components/aaf-service/values.yaml
@@ -1,5 +1,5 @@
# Copyright © 2017 Amdocs, Bell Canada
-# Modifications © 2020 AT&T
+# Modifications © 2020 AT&T, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,6 +13,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ persistence:
+ enabled: true
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
+ aaf:
+ config:
+ image: onap/aaf/aaf_config:2.1.23
+
+
flavor: small
#################################################################
diff --git a/kubernetes/aaf/charts/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/Chart.yaml
rename to kubernetes/aaf/components/aaf-sms/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/resources/config/config.json
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/configmap.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/pv.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/templates/statefulset.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/values.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-quorumclient/values.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-quorumclient/values.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/Chart.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/configmap.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/pv.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/templates/statefulset.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml b/kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/values.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/charts/aaf-sms-vault/values.yaml
rename to kubernetes/aaf/components/aaf-sms/charts/aaf-sms-vault/values.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml
similarity index 75%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-sms/requirements.yaml
index 34932b7..7152c37 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-sms/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,11 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/resources/certs/intermediate_root_ca.pem b/kubernetes/aaf/components/aaf-sms/resources/certs/intermediate_root_ca.pem
new file mode 100644
index 0000000..7939846
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sms/resources/certs/intermediate_root_ca.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEdTCCAl2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAsMQ4wDAYDVQQLDAVPU0FB
+RjENMAsGA1UECgwET05BUDELMAkGA1UEBhMCVVMwHhcNMTgwODE3MTg1MTM3WhcN
+MjMwODE3MTg1MTM3WjBHMQswCQYDVQQGEwJVUzENMAsGA1UECgwET05BUDEOMAwG
+A1UECwwFT1NBQUYxGTAXBgNVBAMMEGludGVybWVkaWF0ZUNBXzkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv0HHUkba3uNtNI3jPKimUcd6RNwmhSCJL
+neMWpnjqp5/A+HCKyNsEaT4y177hNLmCm/aMm1u2JIfikc+8wEqLCSBBPz+P0h+d
+o+sZ7U+4oeQizdYYpEdzHJ2SieHHa8vtu80rU3nO2NEIkuYC20HcKSEtl8fFKsk3
+nqlhY+tGfYJPTXcDOQAO40BTcgat3C3uIJHkWJJ4RivunE4LEuRv9QyKgAw7rkJV
+v+f7guqpZlXy6dzAkuU7XULWcgo55MkZlssoiErMvEZJad5aWKvRY3g7qUjaQ6wO
+15wOAUoRBW96eeZZbytgn8kybcBy++Ue49gPtgm1MF/KlAsp0MD5AgMBAAGjgYYw
+gYMwHQYDVR0OBBYEFIH3mVsQuciM3vNSXupOaaBDPqzdMB8GA1UdIwQYMBaAFFNV
+M/JL69BRscF4msEoMXvv6u1JMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/
+BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
+AQsFAAOCAgEADxNymiCNr2e37iLReoaxKmZvwox0cTiNAaj7iafRzmwIoY3VXO8Q
+ix5IYcp4FaQ7fV1jyp/AmaSnyHf6Osl0sx8PxsQkO7ALttxKUrjfbvNSVUA2C/vl
+u5m7UVJLIUtFDZBWanzUSmkTsYLHpiANFQKd2c/cU1qXcyzgJVFEFVyyHNkF7Is+
++pjG9M1hwQHOoTnEuU013P7X1mHek+RXEfhJWwe7UsZnBKZaZKbQZu7hEtqKWYp/
+QsHgnjoLYXsh0WD5rz/mBxdTdDLGpFqWDzDqb8rsYnqBzoowvsasV8X8OSkov0Ht
+8Yka0ckFH9yf8j1Cwmbl6ttuonOhky3N/gwLEozuhy7TPcZGVyzevF70kXy7g1CX
+kpFGJyEHXoprlNi8FR4I+NFzbDe6a2cFow1JN19AJ9Z5Rk5m7M0mQPaQ4RcikjB3
+aoLsASCJTm1OpOFHfxEKiBW4Lsp3Uc5/Rb9ZNbfLrwqWZRM7buW1e3ekLqntgbky
+uKKISHqVJuw/vXHl1jNibEo9+JuQ88VNuAcm7WpGUogeCa2iAlPTckPZei+MwZ8w
+tpvxTyYlZEC8DWzY1VC29+W2N5cvh01e2E3Ql08W1zL63dqrgdEZ3VWjzooYi4ep
+BmMXTvouW+Flyvcw/0oTcfN0biDIt0mCkZ5CQVjfGL9DTOYteR5hw+k=
+-----END CERTIFICATE-----
diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/has.json b/kubernetes/aaf/components/aaf-sms/resources/config/has.json
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/resources/config/has.json
rename to kubernetes/aaf/components/aaf-sms/resources/config/has.json
diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
rename to kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sms/templates/configmap.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/templates/configmap.yaml
rename to kubernetes/aaf/components/aaf-sms/templates/configmap.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml b/kubernetes/aaf/components/aaf-sms/templates/deployment.yaml
similarity index 76%
rename from kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
rename to kubernetes/aaf/components/aaf-sms/templates/deployment.yaml
index 6113c0d..bb409f3 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/deployment.yaml
@@ -31,8 +31,25 @@
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
spec:
- initContainers:
- - name: fix-permission
+ initContainers: {{ include "common.certInitializer.initContainer" . | nindent 8 }}
+ # Currently intermediate certificate is not given by AAF CM so we need
+ # to give it "by hand"
+ {{- if .Values.global.aafEnabled }}
+ - name: {{ include "common.fullname" . }}-add-intermediate-cert
+ command:
+ - /bin/sh
+ args:
+ - -c
+ - |
+ cat /int-certs/intermediate_root_ca.pem >> {{ .Values.certInitializer.mountPath }}/local/org.onap.aaf-sms.crt
+ image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 12 }}
+ - mountPath: /int-certs
+ name: {{ include "common.fullname" . }}-int-certs
+ readOnly: true
+ {{- end }}
+ - name: {{ include "common.fullname" . }}-fix-permission
command:
- /bin/sh
args:
@@ -85,7 +102,7 @@
path: /v1/sms/quorum/status
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
- volumeMounts:
+ volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -104,13 +121,18 @@
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- volumes:
+ volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
- name: localtime
hostPath:
path: /etc/localtime
- name : {{ include "common.name" . }}
configMap:
name: {{ include "common.fullname" . }}
+ {{- if .Values.global.aafEnabled }}
+ - name: {{ include "common.fullname" . }}-int-certs
+ secret:
+ secretName: {{ include "common.fullname" . }}-int-certs
+ {{- end }}
- name: {{ include "common.fullname" . }}-auth
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/job.yaml b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
similarity index 96%
rename from kubernetes/aaf/charts/aaf-sms/templates/job.yaml
rename to kubernetes/aaf/components/aaf-sms/templates/job.yaml
index bb145ef..315d068 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
@@ -32,7 +32,7 @@
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
spec:
- initContainers:
+ initContainers: {{ include "common.certInitializer.initContainer" . | nindent 6 }}
- command:
- sh
args:
@@ -163,7 +163,7 @@
command:
- "/sms/bin/preload"
- "-cacert"
- - "/sms/certs/aaf_root_ca.cer"
+ - "{{ .Values.certInitializer.mountPath }}/local/{{ .Values.certInitializer.root_ca_name }}"
- "-jsondir"
- "/preload/config"
- "-serviceport"
@@ -171,7 +171,7 @@
- "-serviceurl"
- "https://aaf-sms.{{ include "common.namespace" . }}"
workingDir: /sms
- volumeMounts:
+ volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
- mountPath: /etc/localtime
name: localtime
readOnly: true
@@ -187,7 +187,7 @@
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- volumes:
+ volumes: {{ include "common.certInitializer.volumes" . | nindent 6 }}
- name: localtime
hostPath:
path: /etc/localtime
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/pv.yaml b/kubernetes/aaf/components/aaf-sms/templates/pv.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/templates/pv.yaml
rename to kubernetes/aaf/components/aaf-sms/templates/pv.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/pvc.yaml b/kubernetes/aaf/components/aaf-sms/templates/pvc.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/templates/pvc.yaml
rename to kubernetes/aaf/components/aaf-sms/templates/pvc.yaml
diff --git a/kubernetes/aaf/components/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-sms/templates/secret.yaml
new file mode 100644
index 0000000..7a0213f
--- /dev/null
+++ b/kubernetes/aaf/components/aaf-sms/templates/secret.yaml
@@ -0,0 +1,32 @@
+{{/*
+# Copyright © 2020 Samsung Electronics, 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.
+*/}}
+
+{{ include "common.secretFast" . }}
+---
+{{- if .Values.global.aafEnabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{ include "common.fullname" . }}-int-certs
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/certs/*").AsSecrets . | indent 2 }}
+{{- end }}
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/service.yaml b/kubernetes/aaf/components/aaf-sms/templates/service.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sms/templates/service.yaml
rename to kubernetes/aaf/components/aaf-sms/templates/service.yaml
diff --git a/kubernetes/aaf/charts/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml
similarity index 83%
rename from kubernetes/aaf/charts/aaf-sms/values.yaml
rename to kubernetes/aaf/components/aaf-sms/values.yaml
index 7e0aa5c..dccf57c 100644
--- a/kubernetes/aaf/charts/aaf-sms/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/values.yaml
@@ -1,5 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
-# Modifications © 2020 AT&T
+# Modifications © 2020 AT&T, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,8 +22,38 @@
loggingImage: beats/filebeat:5.5.0
persistence: {}
envsubstImage: dibi/envsubst
+ aafEnabled: true
flavor: small
+
+#################################################################
+# AAF part
+#################################################################
+certInitializer:
+ nameOverride: aaf-sms-cert-init
+ aafDeployFqi: deployer@people.osaaf.org
+ aafDeployPass: demo123456!
+ # aafDeployCredsExternalSecret: some secret
+ fqdn: aaf-sms
+ fqi: aaf-sms@aaf-sms.onap.org
+ public_fqdn: aaf-sms.onap.org
+ cadi_longitude: "0.0"
+ cadi_latitude: "0.0"
+ app_ns: org.osaaf.aaf
+ mountPath: /opt/app/osaaf
+ keystore: truststoreONAPall.jks
+ keystore_pass: changeit
+ root_ca_alias: onaptestca
+ root_ca_name: aaf_root_ca.cer
+ permission_user: 1000
+ permission_group: 1000
+ aaf_add_config: >
+ cd {{ .Values.mountPath }}/local;
+ keytool -exportcert -rfc -file {{ .Values.root_ca_name }} -keystore {{ .Values.keystore }}
+ -alias {{ .Values.root_ca_alias }} -storepass {{ .Values.keystore_pass }};
+ chown -R {{.Values.permission_user}}:{{.Values.permission_group}}
+ {{ .Values.mountPath }};
+
#################################################################
# Application configuration defaults.
#################################################################
@@ -39,9 +69,9 @@
# Example:
config:
smsdbaddress: "http://aaf-sms-db:8200"
- cafile: "/sms/certs/aaf_root_ca.cer"
- servercert: "/sms/certs/aaf-sms.pub"
- serverkey: "/sms/certs/aaf-sms.pr"
+ cafile: "/opt/app/osaaf/local/aaf_root_ca.cer"
+ servercert: "/opt/app/osaaf/local/org.onap.aaf-sms.crt"
+ serverkey: "/opt/app/osaaf/local/org.onap.aaf-sms.key"
password: "c2VjcmV0bWFuYWdlbWVudHNlcnZpY2VzZWNyZXRwYXNzd29yZA=="
# subchart configuration
diff --git a/kubernetes/aaf/charts/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/Chart.yaml
rename to kubernetes/aaf/components/aaf-sshsm/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/README.md b/kubernetes/aaf/components/aaf-sshsm/README.md
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/README.md
rename to kubernetes/aaf/components/aaf-sshsm/README.md
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/configmap.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/statefulset.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/values.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/configmap.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/job.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pv.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/templates/pvc.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-distcenter/values.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/Chart.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/templates/job.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
rename to kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/requirements.yaml
rename to kubernetes/aaf/components/aaf-sshsm/requirements.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/resources/config/prk_passwd b/kubernetes/aaf/components/aaf-sshsm/resources/config/prk_passwd
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/resources/config/prk_passwd
rename to kubernetes/aaf/components/aaf-sshsm/resources/config/prk_passwd
diff --git a/kubernetes/aaf/charts/aaf-sshsm/resources/config/srk_handle b/kubernetes/aaf/components/aaf-sshsm/resources/config/srk_handle
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/resources/config/srk_handle
rename to kubernetes/aaf/components/aaf-sshsm/resources/config/srk_handle
diff --git a/kubernetes/aaf/charts/aaf-sshsm/templates/pv-data.yaml b/kubernetes/aaf/components/aaf-sshsm/templates/pv-data.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/templates/pv-data.yaml
rename to kubernetes/aaf/components/aaf-sshsm/templates/pv-data.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/templates/pv-dbus.yaml b/kubernetes/aaf/components/aaf-sshsm/templates/pv-dbus.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/templates/pv-dbus.yaml
rename to kubernetes/aaf/components/aaf-sshsm/templates/pv-dbus.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/templates/pvc-data.yaml b/kubernetes/aaf/components/aaf-sshsm/templates/pvc-data.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/templates/pvc-data.yaml
rename to kubernetes/aaf/components/aaf-sshsm/templates/pvc-data.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/templates/pvc-dbus.yaml b/kubernetes/aaf/components/aaf-sshsm/templates/pvc-dbus.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/templates/pvc-dbus.yaml
rename to kubernetes/aaf/components/aaf-sshsm/templates/pvc-dbus.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/templates/secret.yaml b/kubernetes/aaf/components/aaf-sshsm/templates/secret.yaml
similarity index 100%
rename from kubernetes/aaf/charts/aaf-sshsm/templates/secret.yaml
rename to kubernetes/aaf/components/aaf-sshsm/templates/secret.yaml
diff --git a/kubernetes/aaf/charts/aaf-sshsm/values.yaml b/kubernetes/aaf/components/aaf-sshsm/values.yaml
similarity index 75%
rename from kubernetes/aaf/charts/aaf-sshsm/values.yaml
rename to kubernetes/aaf/components/aaf-sshsm/values.yaml
index 5600213..30fb0d2 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/values.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/values.yaml
@@ -1,4 +1,5 @@
# Copyright 2018 Intel Corporation, Inc
+# Modifications © 2020 Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,6 +17,23 @@
# Global configuration defaults.
#################################################################
global:
+ nodePortPrefix: 302
+ # Readiness image
+ readinessRepository: oomk8s
+ readinessImage: readiness-check:2.0.2
+ # Ubuntu Init image
+ ubuntuInitRepository: registry.hub.docker.com
+ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
+ # Logging image
+ loggingRepository: docker.elastic.co
+ loggingImage: beats/filebeat:5.5.0
+ # BusyBox image
+ busyboxRepository: registry.hub.docker.com
+ busyboxImage: library/busybox:1.31
+ # Standard OOM
+ pullPolicy: "Always"
+ repository: "nexus3.onap.org:10001"
+
tpm:
enabled: false
# if enabled, nodeselector will use the below
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml
similarity index 72%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-templates/Chart.yaml
index 34932b7..c8739e0 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -1,5 +1,5 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+# Copyright © 2020 Orange
+# Modifications Copyright © 2018 AT&T, 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.
@@ -12,6 +12,8 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+apiVersion: v1
+description: ONAP Application Authorization Framework Templates
+name: aaf-templates
+version: 6.0.0
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
similarity index 83%
copy from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
copy to kubernetes/aaf/components/aaf-templates/requirements.yaml
index 34932b7..6afaa06 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-templates/requirements.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+ # 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.
@@ -12,6 +11,8 @@
# 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.
-*/}}
-{{ include "common.secretFast" . }}
+ dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/aaf/templates/_deployment.tpl b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
similarity index 100%
rename from kubernetes/aaf/templates/_deployment.tpl
rename to kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
diff --git a/kubernetes/aaf/templates/_initContainers.tpl b/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
similarity index 100%
rename from kubernetes/aaf/templates/_initContainers.tpl
rename to kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml b/kubernetes/aaf/components/aaf-templates/values.yaml
similarity index 85%
rename from kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
rename to kubernetes/aaf/components/aaf-templates/values.yaml
index 34932b7..73efdc6 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/secret.yaml
+++ b/kubernetes/aaf/components/aaf-templates/values.yaml
@@ -1,5 +1,4 @@
-{{/*
-# Copyright © 2020 Samsung Electronics
+# 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.
@@ -12,6 +11,3 @@
# 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.
-*/}}
-
-{{ include "common.secretFast" . }}
diff --git a/kubernetes/aaf/requirements.yaml b/kubernetes/aaf/requirements.yaml
index 6a61926..ccbe14c 100644
--- a/kubernetes/aaf/requirements.yaml
+++ b/kubernetes/aaf/requirements.yaml
@@ -1,4 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+# Modifications 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.
@@ -13,6 +15,36 @@
# limitations under the License.
dependencies:
- - name: common
+ - name: aaf-cass
version: ~6.x-0
- repository: '@local'
\ No newline at end of file
+ repository: 'file://components/aaf-cass'
+ - name: aaf-cert-service
+ version: ~6.x-0
+ repository: 'file://components/aaf-cert-service'
+ - name: aaf-cm
+ version: ~6.x-0
+ repository: 'file://components/aaf-cm'
+ - name: aaf-fs
+ version: ~6.x-0
+ repository: 'file://components/aaf-fs'
+ - name: aaf-gui
+ version: ~6.x-0
+ repository: 'file://components/aaf-gui'
+ - name: aaf-hello
+ version: ~6.x-0
+ repository: 'file://components/aaf-hello'
+ - name: aaf-locate
+ version: ~6.x-0
+ repository: 'file://components/aaf-locate'
+ - name: aaf-oauth
+ version: ~6.x-0
+ repository: 'file://components/aaf-oauth'
+ - name: aaf-service
+ version: ~6.x-0
+ repository: 'file://components/aaf-service'
+ - name: aaf-sms
+ version: ~6.x-0
+ repository: 'file://components/aaf-sms'
+ - name: aaf-sshsm
+ version: ~6.x-0
+ repository: 'file://components/aaf-sshsm'