From fd2f8b8d029ea7e83da16d40cd023cebe4b2f75e Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Sat, 21 Nov 2020 22:50:06 +0100 Subject: [PATCH] [MSB] Uses new tpls for repos / images This commit makes MSB chart to use the new generator for repositories and images. As new templates doesn't work well with "sub charts", we move also subcharts to components folder. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux Change-Id: I97de4e13d077a6b7139d98dcd855f93645489035 --- kubernetes/msb/Makefile | 51 ++++++++++++++++++++++ kubernetes/msb/charts/msb-iag/requirements.yaml | 17 -------- kubernetes/msb/components/Makefile | 51 ++++++++++++++++++++++ .../{charts => components}/kube2msb/.helmignore | 0 .../msb/{charts => components}/kube2msb/Chart.yaml | 0 .../kube2msb}/requirements.yaml | 3 ++ .../kube2msb/templates/deployment.yaml | 4 +- .../{charts => components}/kube2msb/values.yaml | 2 - .../{charts => components}/msb-consul/.helmignore | 0 .../{charts => components}/msb-consul/Chart.yaml | 0 .../msb-consul}/requirements.yaml | 3 ++ .../msb-consul/resources/docker-entrypoint.sh | 0 .../msb-consul/templates/NOTES.txt | 0 .../msb-consul/templates/configmap.yaml | 0 .../msb-consul/templates/deployment.yaml | 2 +- .../msb-consul/templates/ingress.yaml | 0 .../msb-consul/templates/service.yaml | 0 .../{charts => components}/msb-consul/values.yaml | 1 - .../msb-discovery/.helmignore | 0 .../msb-discovery/Chart.yaml | 0 .../msb-discovery}/requirements.yaml | 3 ++ .../msb-discovery/resources/config/logback.xml | 0 .../msb-discovery/templates/NOTES.txt | 0 .../msb-discovery/templates/configmap.yaml | 0 .../msb-discovery/templates/deployment.yaml | 6 +-- .../msb-discovery/templates/ingress.yaml | 0 .../msb-discovery/templates/service.yaml | 0 .../msb-discovery/values.yaml | 2 - .../msb/{charts => components}/msb-eag/.helmignore | 0 .../msb/{charts => components}/msb-eag/Chart.yaml | 0 .../msb-eag}/requirements.yaml | 3 ++ .../msb-eag/resources/config/log/logback.xml | 0 .../msb-eag/resources/config/logback.xml | 0 .../msb-eag/templates/NOTES.txt | 0 .../msb-eag/templates/configmap.yaml | 0 .../msb-eag/templates/deployment.yaml | 6 +-- .../msb-eag/templates/ingress.yaml | 0 .../msb-eag/templates/service.yaml | 0 .../msb/{charts => components}/msb-eag/values.yaml | 2 - .../msb/{charts => components}/msb-iag/.helmignore | 0 .../msb/{charts => components}/msb-iag/Chart.yaml | 0 .../msb/components/msb-iag/requirements.yaml | 20 +++++++++ .../msb-iag/resources/config/log/logback.xml | 0 .../msb-iag/resources/config/logback.xml | 0 .../msb-iag/templates/NOTES.txt | 0 .../msb-iag/templates/configmap.yaml | 0 .../msb-iag/templates/deployment.yaml | 6 +-- .../msb-iag/templates/ingress.yaml | 0 .../msb-iag/templates/service.yaml | 0 .../msb/{charts => components}/msb-iag/values.yaml | 2 - kubernetes/msb/requirements.yaml | 18 ++++++++ kubernetes/msb/values.yaml | 2 - 52 files changed, 164 insertions(+), 40 deletions(-) create mode 100644 kubernetes/msb/Makefile delete mode 100644 kubernetes/msb/charts/msb-iag/requirements.yaml create mode 100644 kubernetes/msb/components/Makefile rename kubernetes/msb/{charts => components}/kube2msb/.helmignore (100%) rename kubernetes/msb/{charts => components}/kube2msb/Chart.yaml (100%) rename kubernetes/msb/{charts/msb-eag => components/kube2msb}/requirements.yaml (89%) rename kubernetes/msb/{charts => components}/kube2msb/templates/deployment.yaml (94%) rename kubernetes/msb/{charts => components}/kube2msb/values.yaml (95%) rename kubernetes/msb/{charts => components}/msb-consul/.helmignore (100%) rename kubernetes/msb/{charts => components}/msb-consul/Chart.yaml (100%) rename kubernetes/msb/{charts/kube2msb => components/msb-consul}/requirements.yaml (89%) rename kubernetes/msb/{charts => components}/msb-consul/resources/docker-entrypoint.sh (100%) rename kubernetes/msb/{charts => components}/msb-consul/templates/NOTES.txt (100%) rename kubernetes/msb/{charts => components}/msb-consul/templates/configmap.yaml (100%) rename kubernetes/msb/{charts => components}/msb-consul/templates/deployment.yaml (96%) rename kubernetes/msb/{charts => components}/msb-consul/templates/ingress.yaml (100%) rename kubernetes/msb/{charts => components}/msb-consul/templates/service.yaml (100%) rename kubernetes/msb/{charts => components}/msb-consul/values.yaml (98%) rename kubernetes/msb/{charts => components}/msb-discovery/.helmignore (100%) rename kubernetes/msb/{charts => components}/msb-discovery/Chart.yaml (100%) rename kubernetes/msb/{charts/msb-consul => components/msb-discovery}/requirements.yaml (89%) rename kubernetes/msb/{charts => components}/msb-discovery/resources/config/logback.xml (100%) rename kubernetes/msb/{charts => components}/msb-discovery/templates/NOTES.txt (100%) rename kubernetes/msb/{charts => components}/msb-discovery/templates/configmap.yaml (100%) rename kubernetes/msb/{charts => components}/msb-discovery/templates/deployment.yaml (94%) rename kubernetes/msb/{charts => components}/msb-discovery/templates/ingress.yaml (100%) rename kubernetes/msb/{charts => components}/msb-discovery/templates/service.yaml (100%) rename kubernetes/msb/{charts => components}/msb-discovery/values.yaml (96%) rename kubernetes/msb/{charts => components}/msb-eag/.helmignore (100%) rename kubernetes/msb/{charts => components}/msb-eag/Chart.yaml (100%) rename kubernetes/msb/{charts/msb-discovery => components/msb-eag}/requirements.yaml (90%) rename kubernetes/msb/{charts => components}/msb-eag/resources/config/log/logback.xml (100%) rename kubernetes/msb/{charts => components}/msb-eag/resources/config/logback.xml (100%) rename kubernetes/msb/{charts => components}/msb-eag/templates/NOTES.txt (100%) rename kubernetes/msb/{charts => components}/msb-eag/templates/configmap.yaml (100%) rename kubernetes/msb/{charts => components}/msb-eag/templates/deployment.yaml (95%) rename kubernetes/msb/{charts => components}/msb-eag/templates/ingress.yaml (100%) rename kubernetes/msb/{charts => components}/msb-eag/templates/service.yaml (100%) rename kubernetes/msb/{charts => components}/msb-eag/values.yaml (96%) rename kubernetes/msb/{charts => components}/msb-iag/.helmignore (100%) rename kubernetes/msb/{charts => components}/msb-iag/Chart.yaml (100%) create mode 100644 kubernetes/msb/components/msb-iag/requirements.yaml rename kubernetes/msb/{charts => components}/msb-iag/resources/config/log/logback.xml (100%) rename kubernetes/msb/{charts => components}/msb-iag/resources/config/logback.xml (100%) rename kubernetes/msb/{charts => components}/msb-iag/templates/NOTES.txt (100%) rename kubernetes/msb/{charts => components}/msb-iag/templates/configmap.yaml (100%) rename kubernetes/msb/{charts => components}/msb-iag/templates/deployment.yaml (95%) rename kubernetes/msb/{charts => components}/msb-iag/templates/ingress.yaml (100%) rename kubernetes/msb/{charts => components}/msb-iag/templates/service.yaml (100%) rename kubernetes/msb/{charts => components}/msb-iag/values.yaml (96%) diff --git a/kubernetes/msb/Makefile b/kubernetes/msb/Makefile new file mode 100644 index 0000000000..4c79718d02 --- /dev/null +++ b/kubernetes/msb/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/msb/charts/msb-iag/requirements.yaml b/kubernetes/msb/charts/msb-iag/requirements.yaml deleted file mode 100644 index 6cc26cd239..0000000000 --- a/kubernetes/msb/charts/msb-iag/requirements.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada , ZTE -# -# 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: ~7.x-0 - repository: '@local' diff --git a/kubernetes/msb/components/Makefile b/kubernetes/msb/components/Makefile new file mode 100644 index 0000000000..bf267b7720 --- /dev/null +++ b/kubernetes/msb/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/msb/charts/kube2msb/.helmignore b/kubernetes/msb/components/kube2msb/.helmignore similarity index 100% rename from kubernetes/msb/charts/kube2msb/.helmignore rename to kubernetes/msb/components/kube2msb/.helmignore diff --git a/kubernetes/msb/charts/kube2msb/Chart.yaml b/kubernetes/msb/components/kube2msb/Chart.yaml similarity index 100% rename from kubernetes/msb/charts/kube2msb/Chart.yaml rename to kubernetes/msb/components/kube2msb/Chart.yaml diff --git a/kubernetes/msb/charts/msb-eag/requirements.yaml b/kubernetes/msb/components/kube2msb/requirements.yaml similarity index 89% rename from kubernetes/msb/charts/msb-eag/requirements.yaml rename to kubernetes/msb/components/kube2msb/requirements.yaml index 6cc26cd239..467a52ab21 100644 --- a/kubernetes/msb/charts/msb-eag/requirements.yaml +++ b/kubernetes/msb/components/kube2msb/requirements.yaml @@ -15,3 +15,6 @@ dependencies: - name: common version: ~7.x-0 repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml b/kubernetes/msb/components/kube2msb/templates/deployment.yaml similarity index 94% rename from kubernetes/msb/charts/kube2msb/templates/deployment.yaml rename to kubernetes/msb/components/kube2msb/templates/deployment.yaml index 3d0dcd63ba..ed99deea43 100644 --- a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml +++ b/kubernetes/msb/components/kube2msb/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: 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 }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: KUBE_MASTER_URL diff --git a/kubernetes/msb/charts/kube2msb/values.yaml b/kubernetes/msb/components/kube2msb/values.yaml similarity index 95% rename from kubernetes/msb/charts/kube2msb/values.yaml rename to kubernetes/msb/components/kube2msb/values.yaml index 3c67227873..d2a0a15f49 100644 --- a/kubernetes/msb/charts/kube2msb/values.yaml +++ b/kubernetes/msb/components/kube2msb/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/oom/kube2msb:1.2.6 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-consul/.helmignore b/kubernetes/msb/components/msb-consul/.helmignore similarity index 100% rename from kubernetes/msb/charts/msb-consul/.helmignore rename to kubernetes/msb/components/msb-consul/.helmignore diff --git a/kubernetes/msb/charts/msb-consul/Chart.yaml b/kubernetes/msb/components/msb-consul/Chart.yaml similarity index 100% rename from kubernetes/msb/charts/msb-consul/Chart.yaml rename to kubernetes/msb/components/msb-consul/Chart.yaml diff --git a/kubernetes/msb/charts/kube2msb/requirements.yaml b/kubernetes/msb/components/msb-consul/requirements.yaml similarity index 89% rename from kubernetes/msb/charts/kube2msb/requirements.yaml rename to kubernetes/msb/components/msb-consul/requirements.yaml index 6cc26cd239..467a52ab21 100644 --- a/kubernetes/msb/charts/kube2msb/requirements.yaml +++ b/kubernetes/msb/components/msb-consul/requirements.yaml @@ -15,3 +15,6 @@ dependencies: - name: common version: ~7.x-0 repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/msb/charts/msb-consul/resources/docker-entrypoint.sh b/kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh similarity index 100% rename from kubernetes/msb/charts/msb-consul/resources/docker-entrypoint.sh rename to kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh diff --git a/kubernetes/msb/charts/msb-consul/templates/NOTES.txt b/kubernetes/msb/components/msb-consul/templates/NOTES.txt similarity index 100% rename from kubernetes/msb/charts/msb-consul/templates/NOTES.txt rename to kubernetes/msb/components/msb-consul/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-consul/templates/configmap.yaml b/kubernetes/msb/components/msb-consul/templates/configmap.yaml similarity index 100% rename from kubernetes/msb/charts/msb-consul/templates/configmap.yaml rename to kubernetes/msb/components/msb-consul/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml b/kubernetes/msb/components/msb-consul/templates/deployment.yaml similarity index 96% rename from kubernetes/msb/charts/msb-consul/templates/deployment.yaml rename to kubernetes/msb/components/msb-consul/templates/deployment.yaml index c7472cca72..97dd1781f2 100644 --- a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-consul/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: msb containers: - name: {{ include "common.name" . }} - image: "{{ .Values.global.dockerHubRepository | default .Values.dockerHubRepository }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} securityContext: runAsUser: {{ .Values.securityContext.runAsUser }} diff --git a/kubernetes/msb/charts/msb-consul/templates/ingress.yaml b/kubernetes/msb/components/msb-consul/templates/ingress.yaml similarity index 100% rename from kubernetes/msb/charts/msb-consul/templates/ingress.yaml rename to kubernetes/msb/components/msb-consul/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-consul/templates/service.yaml b/kubernetes/msb/components/msb-consul/templates/service.yaml similarity index 100% rename from kubernetes/msb/charts/msb-consul/templates/service.yaml rename to kubernetes/msb/components/msb-consul/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-consul/values.yaml b/kubernetes/msb/components/msb-consul/values.yaml similarity index 98% rename from kubernetes/msb/charts/msb-consul/values.yaml rename to kubernetes/msb/components/msb-consul/values.yaml index 4704f3b24d..1c7fa38171 100644 --- a/kubernetes/msb/charts/msb-consul/values.yaml +++ b/kubernetes/msb/components/msb-consul/values.yaml @@ -21,7 +21,6 @@ global: # Application configuration defaults. ################################################################# # application image -dockerHubRepository: docker.io image: library/consul:1.4.3 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-discovery/.helmignore b/kubernetes/msb/components/msb-discovery/.helmignore similarity index 100% rename from kubernetes/msb/charts/msb-discovery/.helmignore rename to kubernetes/msb/components/msb-discovery/.helmignore diff --git a/kubernetes/msb/charts/msb-discovery/Chart.yaml b/kubernetes/msb/components/msb-discovery/Chart.yaml similarity index 100% rename from kubernetes/msb/charts/msb-discovery/Chart.yaml rename to kubernetes/msb/components/msb-discovery/Chart.yaml diff --git a/kubernetes/msb/charts/msb-consul/requirements.yaml b/kubernetes/msb/components/msb-discovery/requirements.yaml similarity index 89% rename from kubernetes/msb/charts/msb-consul/requirements.yaml rename to kubernetes/msb/components/msb-discovery/requirements.yaml index 6cc26cd239..467a52ab21 100644 --- a/kubernetes/msb/charts/msb-consul/requirements.yaml +++ b/kubernetes/msb/components/msb-discovery/requirements.yaml @@ -15,3 +15,6 @@ dependencies: - name: common version: ~7.x-0 repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/msb/charts/msb-discovery/resources/config/logback.xml b/kubernetes/msb/components/msb-discovery/resources/config/logback.xml similarity index 100% rename from kubernetes/msb/charts/msb-discovery/resources/config/logback.xml rename to kubernetes/msb/components/msb-discovery/resources/config/logback.xml diff --git a/kubernetes/msb/charts/msb-discovery/templates/NOTES.txt b/kubernetes/msb/components/msb-discovery/templates/NOTES.txt similarity index 100% rename from kubernetes/msb/charts/msb-discovery/templates/NOTES.txt rename to kubernetes/msb/components/msb-discovery/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-discovery/templates/configmap.yaml b/kubernetes/msb/components/msb-discovery/templates/configmap.yaml similarity index 100% rename from kubernetes/msb/charts/msb-discovery/templates/configmap.yaml rename to kubernetes/msb/components/msb-discovery/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml similarity index 94% rename from kubernetes/msb/charts/msb-discovery/templates/deployment.yaml rename to kubernetes/msb/components/msb-discovery/templates/deployment.yaml index bcb9da55a1..e5e5f9eb0f 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: 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 }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -94,7 +94,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/msb/charts/msb-discovery/templates/ingress.yaml b/kubernetes/msb/components/msb-discovery/templates/ingress.yaml similarity index 100% rename from kubernetes/msb/charts/msb-discovery/templates/ingress.yaml rename to kubernetes/msb/components/msb-discovery/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-discovery/templates/service.yaml b/kubernetes/msb/components/msb-discovery/templates/service.yaml similarity index 100% rename from kubernetes/msb/charts/msb-discovery/templates/service.yaml rename to kubernetes/msb/components/msb-discovery/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/components/msb-discovery/values.yaml similarity index 96% rename from kubernetes/msb/charts/msb-discovery/values.yaml rename to kubernetes/msb/components/msb-discovery/values.yaml index 4ac27a8f9d..994e84b722 100644 --- a/kubernetes/msb/charts/msb-discovery/values.yaml +++ b/kubernetes/msb/components/msb-discovery/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/msb/msb_discovery:1.2.6 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-eag/.helmignore b/kubernetes/msb/components/msb-eag/.helmignore similarity index 100% rename from kubernetes/msb/charts/msb-eag/.helmignore rename to kubernetes/msb/components/msb-eag/.helmignore diff --git a/kubernetes/msb/charts/msb-eag/Chart.yaml b/kubernetes/msb/components/msb-eag/Chart.yaml similarity index 100% rename from kubernetes/msb/charts/msb-eag/Chart.yaml rename to kubernetes/msb/components/msb-eag/Chart.yaml diff --git a/kubernetes/msb/charts/msb-discovery/requirements.yaml b/kubernetes/msb/components/msb-eag/requirements.yaml similarity index 90% rename from kubernetes/msb/charts/msb-discovery/requirements.yaml rename to kubernetes/msb/components/msb-eag/requirements.yaml index 6cc26cd239..c59eb6fdf9 100644 --- a/kubernetes/msb/charts/msb-discovery/requirements.yaml +++ b/kubernetes/msb/components/msb-eag/requirements.yaml @@ -15,3 +15,6 @@ dependencies: - name: common version: ~7.x-0 repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' \ No newline at end of file diff --git a/kubernetes/msb/charts/msb-eag/resources/config/log/logback.xml b/kubernetes/msb/components/msb-eag/resources/config/log/logback.xml similarity index 100% rename from kubernetes/msb/charts/msb-eag/resources/config/log/logback.xml rename to kubernetes/msb/components/msb-eag/resources/config/log/logback.xml diff --git a/kubernetes/msb/charts/msb-eag/resources/config/logback.xml b/kubernetes/msb/components/msb-eag/resources/config/logback.xml similarity index 100% rename from kubernetes/msb/charts/msb-eag/resources/config/logback.xml rename to kubernetes/msb/components/msb-eag/resources/config/logback.xml diff --git a/kubernetes/msb/charts/msb-eag/templates/NOTES.txt b/kubernetes/msb/components/msb-eag/templates/NOTES.txt similarity index 100% rename from kubernetes/msb/charts/msb-eag/templates/NOTES.txt rename to kubernetes/msb/components/msb-eag/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-eag/templates/configmap.yaml b/kubernetes/msb/components/msb-eag/templates/configmap.yaml similarity index 100% rename from kubernetes/msb/charts/msb-eag/templates/configmap.yaml rename to kubernetes/msb/components/msb-eag/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/components/msb-eag/templates/deployment.yaml similarity index 95% rename from kubernetes/msb/charts/msb-eag/templates/deployment.yaml rename to kubernetes/msb/components/msb-eag/templates/deployment.yaml index 8ce19fb304..36cb13dc52 100644 --- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-eag/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: 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 }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -108,7 +108,7 @@ spec: {{- end }} # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/msb/charts/msb-eag/templates/ingress.yaml b/kubernetes/msb/components/msb-eag/templates/ingress.yaml similarity index 100% rename from kubernetes/msb/charts/msb-eag/templates/ingress.yaml rename to kubernetes/msb/components/msb-eag/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-eag/templates/service.yaml b/kubernetes/msb/components/msb-eag/templates/service.yaml similarity index 100% rename from kubernetes/msb/charts/msb-eag/templates/service.yaml rename to kubernetes/msb/components/msb-eag/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml similarity index 96% rename from kubernetes/msb/charts/msb-eag/values.yaml rename to kubernetes/msb/components/msb-eag/values.yaml index f63964cd15..b8813b8f1a 100644 --- a/kubernetes/msb/charts/msb-eag/values.yaml +++ b/kubernetes/msb/components/msb-eag/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/msb/msb_apigateway:1.2.7 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-iag/.helmignore b/kubernetes/msb/components/msb-iag/.helmignore similarity index 100% rename from kubernetes/msb/charts/msb-iag/.helmignore rename to kubernetes/msb/components/msb-iag/.helmignore diff --git a/kubernetes/msb/charts/msb-iag/Chart.yaml b/kubernetes/msb/components/msb-iag/Chart.yaml similarity index 100% rename from kubernetes/msb/charts/msb-iag/Chart.yaml rename to kubernetes/msb/components/msb-iag/Chart.yaml diff --git a/kubernetes/msb/components/msb-iag/requirements.yaml b/kubernetes/msb/components/msb-iag/requirements.yaml new file mode 100644 index 0000000000..467a52ab21 --- /dev/null +++ b/kubernetes/msb/components/msb-iag/requirements.yaml @@ -0,0 +1,20 @@ +# Copyright © 2018 Amdocs, Bell Canada , ZTE +# +# 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: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/msb/charts/msb-iag/resources/config/log/logback.xml b/kubernetes/msb/components/msb-iag/resources/config/log/logback.xml similarity index 100% rename from kubernetes/msb/charts/msb-iag/resources/config/log/logback.xml rename to kubernetes/msb/components/msb-iag/resources/config/log/logback.xml diff --git a/kubernetes/msb/charts/msb-iag/resources/config/logback.xml b/kubernetes/msb/components/msb-iag/resources/config/logback.xml similarity index 100% rename from kubernetes/msb/charts/msb-iag/resources/config/logback.xml rename to kubernetes/msb/components/msb-iag/resources/config/logback.xml diff --git a/kubernetes/msb/charts/msb-iag/templates/NOTES.txt b/kubernetes/msb/components/msb-iag/templates/NOTES.txt similarity index 100% rename from kubernetes/msb/charts/msb-iag/templates/NOTES.txt rename to kubernetes/msb/components/msb-iag/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-iag/templates/configmap.yaml b/kubernetes/msb/components/msb-iag/templates/configmap.yaml similarity index 100% rename from kubernetes/msb/charts/msb-iag/templates/configmap.yaml rename to kubernetes/msb/components/msb-iag/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/components/msb-iag/templates/deployment.yaml similarity index 95% rename from kubernetes/msb/charts/msb-iag/templates/deployment.yaml rename to kubernetes/msb/components/msb-iag/templates/deployment.yaml index 42f36cd279..00dc6b69b3 100644 --- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-iag/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: 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 }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -108,7 +108,7 @@ spec: {{- end }} # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/msb/charts/msb-iag/templates/ingress.yaml b/kubernetes/msb/components/msb-iag/templates/ingress.yaml similarity index 100% rename from kubernetes/msb/charts/msb-iag/templates/ingress.yaml rename to kubernetes/msb/components/msb-iag/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-iag/templates/service.yaml b/kubernetes/msb/components/msb-iag/templates/service.yaml similarity index 100% rename from kubernetes/msb/charts/msb-iag/templates/service.yaml rename to kubernetes/msb/components/msb-iag/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml similarity index 96% rename from kubernetes/msb/charts/msb-iag/values.yaml rename to kubernetes/msb/components/msb-iag/values.yaml index b1f19c9448..b91ddcae1b 100644 --- a/kubernetes/msb/charts/msb-iag/values.yaml +++ b/kubernetes/msb/components/msb-iag/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/msb/msb_apigateway:1.2.7 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml index 6cc26cd239..c52bec4944 100644 --- a/kubernetes/msb/requirements.yaml +++ b/kubernetes/msb/requirements.yaml @@ -15,3 +15,21 @@ dependencies: - name: common version: ~7.x-0 repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' + - name: kube2msb + version: ~7.x-0 + repository: 'file://components/kube2msb' + - name: msb-consul + version: ~7.x-0 + repository: 'file://components/msb-consul' + - name: msb-discovery + version: ~7.x-0 + repository: 'file://components/msb-discovery' + - name: msb-eag + version: ~7.x-0 + repository: 'file://components/msb-eag' + - name: msb-iag + version: ~7.x-0 + repository: 'file://components/msb-iag' \ No newline at end of file diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml index 27fc008a5a..739fcea9d2 100644 --- a/kubernetes/msb/values.yaml +++ b/kubernetes/msb/values.yaml @@ -18,8 +18,6 @@ ################################################################# global: nodePortPrefix: 302 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 # application configuration config: -- 2.16.6