aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:46:57 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-23 17:39:23 +0100
commit37dc40c21527d479daa838f18949c1da4151d987 (patch)
treee6de08804b7bcb01e8d2e2a0c9c0cff2a29439b7
parentf0dacd23777a7998915afe00150b25135b932f86 (diff)
[MULTICLOUD] Uses new tpls for repos / images
This commit makes Multicloud 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 <sylvain.desbureaux@orange.com> Change-Id: I34049a733bddc6faf7a68e4c768c447b6c2e34b1
-rw-r--r--kubernetes/multicloud/Makefile40
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml131
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml145
-rw-r--r--kubernetes/multicloud/components/Makefile51
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/.helmignore (renamed from kubernetes/multicloud/charts/multicloud-azure/.helmignore)0
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-azure/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/requirements.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/resources/config/log/log.yml (renamed from kubernetes/multicloud/charts/multicloud-azure/resources/config/log/log.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/templates/NOTES.txt (renamed from kubernetes/multicloud/charts/multicloud-azure/templates/NOTES.txt)0
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-azure/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml)4
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-azure/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-azure/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-azure/values.yaml)1
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/.helmignore (renamed from kubernetes/multicloud/charts/multicloud-fcaps/.helmignore)0
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml (renamed from kubernetes/multicloud/charts/multicloud-fcaps/resources/config/log/log.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/templates/NOTES.txt (renamed from kubernetes/multicloud/charts/multicloud-fcaps/templates/NOTES.txt)0
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-fcaps/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml)6
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-fcaps/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-fcaps/values.yaml)1
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/requirements.yaml (renamed from kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml)3
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json (renamed from kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json)0
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/resources/config/k8sconfig.json (renamed from kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json)0
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-k8s/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml)4
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-k8s/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-k8s/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-k8s/values.yaml)6
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/.helmignore (renamed from kubernetes/multicloud/charts/multicloud-pike/.helmignore)0
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-pike/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/requirements.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml (renamed from kubernetes/multicloud/charts/multicloud-pike/resources/config/log/log.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/templates/NOTES.txt (renamed from kubernetes/multicloud/charts/multicloud-pike/templates/NOTES.txt)0
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-pike/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml)4
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-pike/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-pike/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-pike/values.yaml)1
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml)4
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml)4
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/resources/config/prometheus.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml)6
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml)10
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/templates/pv.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml)2
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/templates/pvc.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml)4
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml)6
-rw-r--r--kubernetes/multicloud/components/multicloud-prometheus/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-prometheus/values.yaml)5
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/.helmignore (renamed from kubernetes/multicloud/charts/multicloud-starlingx/.helmignore)0
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-starlingx/Chart.yaml)2
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json (renamed from kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json)0
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml (renamed from kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/log.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/templates/NOTES.txt (renamed from kubernetes/multicloud/charts/multicloud-starlingx/templates/NOTES.txt)0
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-starlingx/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml130
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-starlingx/values.yaml)1
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/.helmignore (renamed from kubernetes/multicloud/charts/multicloud-vio/.helmignore)0
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-vio/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/requirements.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/resources/config/log/log.yml (renamed from kubernetes/multicloud/charts/multicloud-vio/resources/config/log/log.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/templates/NOTES.txt (renamed from kubernetes/multicloud/charts/multicloud-vio/templates/NOTES.txt)0
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-vio/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml (renamed from kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml)4
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-vio/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-vio/values.yaml)1
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/.helmignore (renamed from kubernetes/multicloud/charts/multicloud-windriver/.helmignore)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/Chart.yaml (renamed from kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/requirements.yaml22
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json (renamed from kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml (renamed from kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/log.yml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt1
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/NOTES.txt (renamed from kubernetes/multicloud/charts/multicloud-windriver/templates/NOTES.txt)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/configmap.yaml (renamed from kubernetes/multicloud/charts/multicloud-windriver/templates/configmap.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml144
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/pv.yaml (renamed from kubernetes/multicloud/charts/multicloud-windriver/templates/pv.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/pvc.yaml (renamed from kubernetes/multicloud/charts/multicloud-windriver/templates/pvc.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml (renamed from kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml)0
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/values.yaml (renamed from kubernetes/multicloud/charts/multicloud-windriver/values.yaml)5
-rw-r--r--kubernetes/multicloud/requirements.yaml35
-rw-r--r--kubernetes/multicloud/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/values.yaml20
99 files changed, 599 insertions, 340 deletions
diff --git a/kubernetes/multicloud/Makefile b/kubernetes/multicloud/Makefile
index 027e2af72d..4c79718d02 100644
--- a/kubernetes/multicloud/Makefile
+++ b/kubernetes/multicloud/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2019 Intel Corporation, Inc
+# 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.
@@ -11,9 +11,41 @@
# 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
-make-multicloud: make-multicloud-k8s
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
-make-multicloud-k8s:
- cd charts && $(HELM_BIN) dep up multicloud-k8s && $(HELM_BIN) lint multicloud-k8s
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
deleted file mode 100644
index 80e9a97f3b..0000000000
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-{{/*
-# Copyright (c) 2019 Intel Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "common.fullname" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app: {{ include "common.name" . }}
- template:
- metadata:
- labels:
- app: {{ include "common.name" . }}
- release: {{ include "common.release" . }}
- name: {{ include "common.name" . }}
- annotations:
- sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
- spec:
- containers:
- - env:
- - name: MSB_PROTO
- value: {{ .Values.config.msbprotocol }}
- - name: MSB_ADDR
- value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- - name: MSB_PORT
- value: "{{ .Values.config.msbPort }}"
- - name: AAI_ADDR
- value: aai.{{ include "common.namespace" . }}
- - name: AAI_PORT
- value: "{{ .Values.config.aai.port }}"
- - name: AAI_SCHEMA_VERSION
- value: "{{ .Values.config.aai.schemaVersion }}"
- - name: AAI_USERNAME
- value: "{{ .Values.config.aai.username }}"
- - name: AAI_PASSWORD
- value: "{{ .Values.config.aai.password }}"
- - name: SSL_ENABLED
- value: "{{ .Values.config.ssl_enabled }}"
- name: {{ include "common.name" . }}
- volumeMounts:
- - mountPath: /var/log/onap
- name: starlingx-log
- - mountPath: /opt/starlingx/starlingx/pub/config/log.yml
- name: starlingx-logconfig
- subPath: log.yml
- - mountPath: /opt/artifacts/
- name: artifact-data
- resources:
-{{ include "common.resources" . | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- ports:
- - containerPort: {{ .Values.service.internalPort }}
- # disable liveness probe when breakpoints set in debugger
- # so K8s doesn't restart unresponsive container
- {{ if .Values.liveness.enabled }}
- livenessProbe:
- httpGet:
- path: /api/multicloud-starlingx/v0/swagger.json
- port: {{ .Values.service.internalPort }}
- scheme: HTTPS
- initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.liveness.periodSeconds }}
- timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
- successThreshold: {{ .Values.liveness.successThreshold }}
- failureThreshold: {{ .Values.liveness.failureThreshold }}
- {{ end }}
- # side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: starlingx-log
- - mountPath: /usr/share/filebeat/data
- name: starlingx-data-filebeat
- - image: "{{ include "common.repository" . }}/{{ .Values.global.artifactImage }}"
- name: framework-artifactbroker
- command: ["/opt/app/distribution/bin/artifact-dist.sh"]
- args: ["/opt/app/distribution/etc/mounted/config.json"]
- ports:
- - containerPort: 9014
- protocol: TCP
- volumeMounts:
- - mountPath: /opt/app/distribution/etc/mounted/config.json
- name: starlingx-logconfig
- subPath: config.json
- - mountPath: /data
- name: artifact-data
-
- volumes:
- - name: starlingx-log
- emptyDir: {}
- - name: starlingx-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
- - name: starlingx-logconfig
- configMap:
- name: {{ include "common.fullname" . }}-log-configmap
- - name: artifact-data
- emptyDir: {}
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
deleted file mode 100644
index b6773a5a6a..0000000000
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: {{ include "common.fullname" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app: {{ include "common.name" . }}
- template:
- metadata:
- labels:
- app: {{ include "common.name" . }}
- release: {{ include "common.release" . }}
- name: {{ include "common.name" . }}
- annotations:
- sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
- spec:
- initContainers:
- - command: ["sh", "-c", "chown -R 100:101 /data"]
- image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.global.ubuntuInitImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-init
- volumeMounts:
- - mountPath: /data
- name: artifact-data
- containers:
- - env:
- - name: MSB_PROTO
- value: {{ .Values.config.msbprotocol }}
- - name: MSB_ADDR
- value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
- - name: MSB_PORT
- value: "{{ .Values.config.msbPort }}"
- - name: AAI_ADDR
- value: aai.{{ include "common.namespace" . }}
- - name: AAI_PORT
- value: "{{ .Values.config.aai.port }}"
- - name: AAI_SCHEMA_VERSION
- value: "{{ .Values.config.aai.schemaVersion }}"
- - name: AAI_USERNAME
- value: "{{ .Values.config.aai.username }}"
- - name: AAI_PASSWORD
- value: "{{ .Values.config.aai.password }}"
- - name: SSL_ENABLED
- value: "{{ .Values.config.ssl_enabled }}"
- name: {{ include "common.name" . }}
- volumeMounts:
- - mountPath: /var/log/onap
- name: windriver-log
- - mountPath: /opt/windriver/titanium_cloud/pub/config/log.yml
- name: windriver-logconfig
- subPath: log.yml
- - mountPath: /opt/artifacts/
- name: artifact-data
- resources:
-{{ include "common.resources" . | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- ports:
- - containerPort: {{ .Values.service.internalPort }}
- # disable liveness probe when breakpoints set in debugger
- # so K8s doesn't restart unresponsive container
- {{ if .Values.liveness.enabled }}
- livenessProbe:
- httpGet:
- path: /api/multicloud-titaniumcloud/v1/swagger.json
- port: {{ .Values.service.internalPort }}
- scheme: HTTPS
- initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.liveness.periodSeconds }}
- timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
- successThreshold: {{ .Values.liveness.successThreshold }}
- failureThreshold: {{ .Values.liveness.failureThreshold }}
- {{ end }}
- # side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: windriver-log
- - mountPath: /usr/share/filebeat/data
- name: windriver-data-filebeat
- - image: "{{ include "common.repository" . }}/{{ .Values.global.artifactImage }}"
- name: framework-artifactbroker
- command: ["/opt/app/distribution/bin/artifact-dist.sh"]
- args: ["/opt/app/distribution/etc/mounted/config.json"]
- ports:
- - containerPort: 9014
- protocol: TCP
- volumeMounts:
- - mountPath: /opt/app/distribution/etc/mounted/config.json
- name: windriver-logconfig
- subPath: config.json
- - mountPath: /data
- name: artifact-data
-
- volumes:
- - name: windriver-log
- emptyDir: {}
- - name: windriver-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
- - name: windriver-logconfig
- configMap:
- name: {{ include "common.fullname" . }}-log-configmap
- - name: artifact-data
- {{- if .Values.persistence.enabled }}
- persistentVolumeClaim:
- claimName: {{ include "common.fullname" . }}
- {{- else }}
- emptyDir: {}
- {{- end }}
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Always
diff --git a/kubernetes/multicloud/components/Makefile b/kubernetes/multicloud/components/Makefile
new file mode 100644
index 0000000000..f2e7a1fb82
--- /dev/null
+++ b/kubernetes/multicloud/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 := soHelpers
+HELM_BIN := helm
+HELM_CHARTS := soHelpers $(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/multicloud/charts/multicloud-azure/.helmignore b/kubernetes/multicloud/components/multicloud-azure/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/.helmignore
+++ b/kubernetes/multicloud/components/multicloud-azure/.helmignore
diff --git a/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml b/kubernetes/multicloud/components/multicloud-azure/Chart.yaml
index 578123c2a6..578123c2a6 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-azure/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-azure/requirements.yaml b/kubernetes/multicloud/components/multicloud-azure/requirements.yaml
new file mode 100644
index 0000000000..bdc19209e7
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-azure/requirements.yaml
@@ -0,0 +1,22 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-azure/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-azure/resources/config/log/log.yml
index d47a3581c2..d47a3581c2 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-azure/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/charts/multicloud-azure/templates/NOTES.txt b/kubernetes/multicloud/components/multicloud-azure/templates/NOTES.txt
index befedf4578..befedf4578 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/templates/NOTES.txt
+++ b/kubernetes/multicloud/components/multicloud-azure/templates/NOTES.txt
diff --git a/kubernetes/multicloud/charts/multicloud-azure/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-azure/templates/configmap.yaml
index 8a6c488ead..8a6c488ead 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-azure/templates/configmap.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-azure/templates/deployment.yaml
index 312c46651b..445b0697d5 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-azure/templates/deployment.yaml
@@ -64,7 +64,7 @@ spec:
subPath: log.yml
resources:
{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@ -83,7 +83,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end -}}
# side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ - image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: filebeat-onap
volumeMounts:
diff --git a/kubernetes/multicloud/charts/multicloud-azure/templates/service.yaml b/kubernetes/multicloud/components/multicloud-azure/templates/service.yaml
index f52d8690ea..f52d8690ea 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-azure/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-azure/values.yaml b/kubernetes/multicloud/components/multicloud-azure/values.yaml
index 131c8c9d65..0749c0b432 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-azure/values.yaml
@@ -23,7 +23,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/multicloud/azure:1.2.4
pullPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/.helmignore b/kubernetes/multicloud/components/multicloud-fcaps/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/.helmignore
+++ b/kubernetes/multicloud/components/multicloud-fcaps/.helmignore
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
index a392ba25a4..a392ba25a4 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
new file mode 100644
index 0000000000..bdc19209e7
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml
@@ -0,0 +1,22 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml
index 21991b75fe..21991b75fe 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/NOTES.txt b/kubernetes/multicloud/components/multicloud-fcaps/templates/NOTES.txt
index ae62a4f604..ae62a4f604 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/NOTES.txt
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/NOTES.txt
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/configmap.yaml
index 5fb6bb69df..5fb6bb69df 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/configmap.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
index 110f9aa84f..99d2314a07 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
subPath: log.yml
resources:
{{ include "common.resources" . | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@ -86,7 +86,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ - image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: filebeat-onap
volumeMounts:
@@ -97,7 +97,7 @@ spec:
name: fcaps-log
- mountPath: /usr/share/filebeat/data
name: fcaps-data-filebeat
- - image: {{ .Values.rabbitmq }}
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.rabbitmq }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: rabbit-mq
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/service.yaml
index fabe32e0ff..fabe32e0ff 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index 6182cbe6c1..c66e4e829f 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -22,7 +22,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/multicloud/openstack-fcaps:1.5.5
pullPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index cbd8da9bec..cbd8da9bec 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
index 78faffd976..9071fafece 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml
@@ -25,3 +25,6 @@ dependencies:
- name: etcd
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json b/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json
index 2ce2d8564b..2ce2d8564b 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json
+++ b/kubernetes/multicloud/components/multicloud-k8s/resources/config/config.json
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json b/kubernetes/multicloud/components/multicloud-k8s/resources/config/k8sconfig.json
index d6fa40d471..d6fa40d471 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json
+++ b/kubernetes/multicloud/components/multicloud-k8s/resources/config/k8sconfig.json
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/configmap.yaml
index a159b65379..a159b65379 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/configmap.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index a64324a86e..9f50d35784 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
release: {{ include "common.release" . }}
spec:
containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}
command: ["/opt/multicloud/k8splugin/k8plugin"]
@@ -72,7 +72,7 @@ spec:
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- - image: "{{ include "common.repository" . }}/{{ .Values.global.artifactImage }}"
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
name: framework-artifactbroker
command: ["/opt/app/distribution/bin/artifact-dist.sh"]
args: ["/opt/app/distribution/etc/mounted/config.json"]
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/templates/service.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/service.yaml
index b2b39db899..b2b39db899 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 4b7e6f7816..5c840ec9a4 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -17,15 +17,13 @@
#################################################################
global:
nodePortPrefixExt: 304
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
persistence: {}
+ artifactImage: onap/multicloud/framework-artifactbroker:1.6.0
+
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/multicloud/k8s:0.7.0
pullPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-pike/.helmignore b/kubernetes/multicloud/components/multicloud-pike/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/.helmignore
+++ b/kubernetes/multicloud/components/multicloud-pike/.helmignore
diff --git a/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
index e86273c90b..e86273c90b 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
new file mode 100644
index 0000000000..bdc19209e7
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml
@@ -0,0 +1,22 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-pike/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml
index 43e681e615..43e681e615 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-pike/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/charts/multicloud-pike/templates/NOTES.txt b/kubernetes/multicloud/components/multicloud-pike/templates/NOTES.txt
index 7adeb620b5..7adeb620b5 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/templates/NOTES.txt
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/NOTES.txt
diff --git a/kubernetes/multicloud/charts/multicloud-pike/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/configmap.yaml
index df5f76a478..df5f76a478 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/configmap.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
index bfcacb8013..b48e8dc431 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
subPath: log.yml
resources:
{{ include "common.resources" . | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@ -86,7 +86,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ - image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: filebeat-onap
volumeMounts:
diff --git a/kubernetes/multicloud/charts/multicloud-pike/templates/service.yaml b/kubernetes/multicloud/components/multicloud-pike/templates/service.yaml
index 503fae375a..503fae375a 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-pike/values.yaml b/kubernetes/multicloud/components/multicloud-pike/values.yaml
index 50ced500d5..3fc572631a 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/values.yaml
@@ -22,7 +22,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/multicloud/openstack-pike:1.5.5
pullPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
index 0f5533dbb5..0f5533dbb5 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
index 52116145b4..52116145b4 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml
index 3dd1acb5b0..3dd1acb5b0 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml
index 2dafcc381e..2dafcc381e 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
index d81d638731..ca56b670cd 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}-configmap-reload
- image: "{{ .Values.global.configmapReload.image.repository }}:{{ .Values.global.configmapReload.image.tag }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.global.configmapReload.image.repository }}:{{ .Values.global.configmapReload.image.tag }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
args:
- --volume-dir=/etc/config
@@ -51,7 +51,7 @@ spec:
readOnly: true
- name: {{ include "common.name" . }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
args:
- --config.file=/etc/config/alertmanager.yml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml
index aa1485da57..aa1485da57 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml
index 918d002cdb..918d002cdb 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml
index da5156a93a..da5156a93a 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
index ccd70b30cf..ccd70b30cf 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
index 1456eff4e7..1456eff4e7 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini
index 9dc0f09cd9..9dc0f09cd9 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml
index ab570896db..ab570896db 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
index 7fc8ac8c1e..2dea842733 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
{{- if .Values.dashboards }}
initContainers:
- name: {{ include "common.name" . }}-download-dashboards
- image: "{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["sh", "/etc/grafana/download_dashboards.sh"]
volumeMounts:
@@ -54,7 +54,7 @@ spec:
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
{{ toYaml .Values.resources | indent 10 }}
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml
index 0c7ea4b560..0c7ea4b560 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml
index 68ab6c487f..68ab6c487f 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml
index 775af0afa7..775af0afa7 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml
index 43f4e93a6f..43f4e93a6f 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
new file mode 100644
index 0000000000..bdc19209e7
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
@@ -0,0 +1,22 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/resources/config/prometheus.yml b/kubernetes/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
index 0355b48ab5..0355b48ab5 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/resources/config/prometheus.yml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/resources/config/prometheus.yml
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml
index 0f0b59fa18..471c9094aa 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/templates/configmap.yaml
@@ -14,8 +14,6 @@
# limitations under the License.
*/}}
-{{- if .Values.global.prometheus.enabled -}}
-
apiVersion: v1
kind: ConfigMap
metadata:
@@ -27,6 +25,4 @@ metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
-
-{{- end -}} \ No newline at end of file
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml
index cb76bace9c..3a5c8edb5f 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/templates/deployment.yaml
@@ -14,8 +14,6 @@
# limitations under the License.
*/}}
-{{- if .Values.global.prometheus.enabled -}}
-
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -39,7 +37,7 @@ spec:
name: {{ include "common.name" . }}
spec:
initContainers:
- - image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ - image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-chown-init
command: ["chown", "-R", "65534:65534", "{{ .Values.persistence.containerMountPath }}"]
@@ -48,7 +46,7 @@ spec:
mountPath: {{ .Values.persistence.containerMountPath }}
containers:
- name: {{ include "common.name" . }}-configmap-reload
- image: "{{ .Values.global.configmapReload.image.repository }}:{{ .Values.global.configmapReload.image.tag }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.global.configmapReload.image.repository }}:{{ .Values.global.configmapReload.image.tag }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
args:
- --volume-dir=/etc/config
@@ -59,7 +57,7 @@ spec:
readOnly: true
- name: {{ include "common.name" . }}-server
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
args:
- --config.file=/etc/config/prometheus.yml
@@ -121,5 +119,3 @@ spec:
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Always
-
-{{- end -}}
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/templates/pv.yaml
index 9bd51de78c..1b67193e7a 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pv.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/templates/pv.yaml
@@ -14,7 +14,6 @@
# limitations under the License.
*/}}
-{{- if .Values.global.prometheus.enabled -}}
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
{{- if eq "True" (include "common.needPV" .) -}}
kind: PersistentVolume
@@ -39,4 +38,3 @@ spec:
path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ include "common.release" . }}/{{ .Values.persistence.mountSubPath }}
{{- end -}}
{{- end -}}
-{{- end -}}
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/templates/pvc.yaml
index 83e05bf868..77cc681743 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/pvc.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/templates/pvc.yaml
@@ -14,8 +14,6 @@
# limitations under the License.
*/}}
-{{- if .Values.global.prometheus.enabled -}}
-
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
kind: PersistentVolumeClaim
apiVersion: v1
@@ -39,5 +37,3 @@ spec:
requests:
storage: {{ .Values.persistence.size }}
{{- end -}}
-
-{{- end -}}
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/templates/service.yaml
index 90e21b7354..b8dbb687fb 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/templates/service.yaml
@@ -14,8 +14,6 @@
# limitations under the License.
*/}}
-{{- if .Values.global.prometheus.enabled -}}
-
apiVersion: v1
kind: Service
metadata:
@@ -41,6 +39,4 @@ spec:
protocol: TCP
selector:
app: {{ include "common.name" . }}
- release: {{ include "common.release" . }}
-
-{{- end -}} \ No newline at end of file
+ release: {{ include "common.release" . }} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
index 11c09795b7..fa949c0c75 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/values.yaml
@@ -17,11 +17,6 @@
#################################################################
global:
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- busyboxRepository: docker.io
- busyboxImage: library/busybox:latest
alertmanager:
enabled: false
grafana:
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/.helmignore b/kubernetes/multicloud/components/multicloud-starlingx/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/.helmignore
+++ b/kubernetes/multicloud/components/multicloud-starlingx/.helmignore
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/Chart.yaml b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
index 1305d419bb..1fba2ae385 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: ONAP multicloud OpenStack Starlingx Plugin
name: multicloud-starlingx
-version: 3.0.0
+version: 6.0.0
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
new file mode 100644
index 0000000000..bdc19209e7
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml
@@ -0,0 +1,22 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
index da0727c3a7..da0727c3a7 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/config.json
+++ b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/config.json
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
index e4d3d54b38..e4d3d54b38 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/NOTES.txt b/kubernetes/multicloud/components/multicloud-starlingx/templates/NOTES.txt
index 746215b541..746215b541 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/NOTES.txt
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/NOTES.txt
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/configmap.yaml
index e271a4f233..e271a4f233 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
new file mode 100644
index 0000000000..5413327d0b
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
@@ -0,0 +1,130 @@
+{{/*
+# Copyright (c) 2019 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}
+ release: {{ include "common.release" . }}
+ name: {{ include "common.name" . }}
+ annotations:
+ sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
+ spec:
+ containers:
+ - env:
+ - name: MSB_PROTO
+ value: {{ .Values.config.msbprotocol }}
+ - name: MSB_ADDR
+ value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
+ - name: MSB_PORT
+ value: "{{ .Values.config.msbPort }}"
+ - name: AAI_ADDR
+ value: aai.{{ include "common.namespace" . }}
+ - name: AAI_PORT
+ value: "{{ .Values.config.aai.port }}"
+ - name: AAI_SCHEMA_VERSION
+ value: "{{ .Values.config.aai.schemaVersion }}"
+ - name: AAI_USERNAME
+ value: "{{ .Values.config.aai.username }}"
+ - name: AAI_PASSWORD
+ value: "{{ .Values.config.aai.password }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.config.ssl_enabled }}"
+ name: {{ include "common.name" . }}
+ volumeMounts:
+ - mountPath: /var/log/onap
+ name: starlingx-log
+ - mountPath: /opt/starlingx/starlingx/pub/config/log.yml
+ name: starlingx-logconfig
+ subPath: log.yml
+ - mountPath: /opt/artifacts/
+ name: artifact-data
+ resources: {{ include "common.resources" . | nindent 12 }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ ports:
+ - containerPort: {{ .Values.service.internalPort }}
+ # disable liveness probe when breakpoints set in debugger
+ # so K8s doesn't restart unresponsive container
+ {{ if .Values.liveness.enabled }}
+ livenessProbe:
+ httpGet:
+ path: /api/multicloud-starlingx/v0/swagger.json
+ port: {{ .Values.service.internalPort }}
+ scheme: HTTPS
+ initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.liveness.periodSeconds }}
+ timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
+ successThreshold: {{ .Values.liveness.successThreshold }}
+ failureThreshold: {{ .Values.liveness.failureThreshold }}
+ {{ end }}
+ # side car containers
+ - image: {{ include "repositoryGenerator.image.logging" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: filebeat-onap
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ subPath: filebeat.yml
+ - mountPath: /var/log/onap
+ name: starlingx-log
+ - mountPath: /usr/share/filebeat/data
+ name: starlingx-data-filebeat
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
+ name: framework-artifactbroker
+ command: ["/opt/app/distribution/bin/artifact-dist.sh"]
+ args: ["/opt/app/distribution/etc/mounted/config.json"]
+ ports:
+ - containerPort: 9014
+ protocol: TCP
+ volumeMounts:
+ - mountPath: /opt/app/distribution/etc/mounted/config.json
+ name: starlingx-logconfig
+ subPath: config.json
+ - mountPath: /data
+ name: artifact-data
+
+ volumes:
+ - name: starlingx-log
+ emptyDir: {}
+ - name: starlingx-data-filebeat
+ emptyDir: {}
+ - name: filebeat-conf
+ configMap:
+ name: multicloud-filebeat-configmap
+ - name: starlingx-logconfig
+ configMap:
+ name: {{ include "common.fullname" . }}-log-configmap
+ - name: artifact-data
+ emptyDir: {}
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
+ restartPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml
index cf67f106ee..cf67f106ee 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index cb065d6f20..cde6f67cc5 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -17,6 +17,7 @@
#################################################################
global:
nodePortPrefixExt: 304
+ artifactImage: onap/multicloud/framework-artifactbroker:1.6.0
#################################################################
# Application configuration defaults.
diff --git a/kubernetes/multicloud/charts/multicloud-vio/.helmignore b/kubernetes/multicloud/components/multicloud-vio/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/.helmignore
+++ b/kubernetes/multicloud/components/multicloud-vio/.helmignore
diff --git a/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
index 4bb6ba05d5..4bb6ba05d5 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
new file mode 100644
index 0000000000..bdc19209e7
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml
@@ -0,0 +1,22 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-vio/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-vio/resources/config/log/log.yml
index 137a6908f3..137a6908f3 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-vio/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/NOTES.txt b/kubernetes/multicloud/components/multicloud-vio/templates/NOTES.txt
index befedf4578..befedf4578 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/NOTES.txt
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/NOTES.txt
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-vio/templates/configmap.yaml
index ed43b24c76..ed43b24c76 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/configmap.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
index 5cab1ad205..520f86a7d1 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/deployment.yaml
@@ -64,7 +64,7 @@ spec:
subPath: log.yml
resources:
{{ include "common.resources" . | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@ -83,7 +83,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end -}}
# side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ - image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: filebeat-onap
volumeMounts:
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml b/kubernetes/multicloud/components/multicloud-vio/templates/service.yaml
index 4a926df420..4a926df420 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-vio/values.yaml b/kubernetes/multicloud/components/multicloud-vio/values.yaml
index c4618fa9c5..1a5af2ca48 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/values.yaml
@@ -23,7 +23,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/multicloud/vio:1.4.1
pullPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/.helmignore b/kubernetes/multicloud/components/multicloud-windriver/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/.helmignore
+++ b/kubernetes/multicloud/components/multicloud-windriver/.helmignore
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
index eadb375669..eadb375669 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
new file mode 100644
index 0000000000..bdc19209e7
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml
@@ -0,0 +1,22 @@
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
index 655076a901..655076a901 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/config.json
+++ b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/config.json
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/log.yml b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml
index 79ff56adaa..79ff56adaa 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/resources/config/log/log.yml
+++ b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/log.yml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt
new file mode 100644
index 0000000000..6c1e709b92
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-windriver/resources/config/log/test.txt
@@ -0,0 +1 @@
+resources: {{ include "common.resources" . | indent 12 | trim}} \ No newline at end of file
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/NOTES.txt b/kubernetes/multicloud/components/multicloud-windriver/templates/NOTES.txt
index befedf4578..befedf4578 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/NOTES.txt
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/NOTES.txt
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/configmap.yaml
index ed43b24c76..ed43b24c76 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/configmap.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
new file mode 100644
index 0000000000..2ed0b13249
--- /dev/null
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -0,0 +1,144 @@
+{{/*
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}
+ release: {{ include "common.release" . }}
+ name: {{ include "common.name" . }}
+ annotations:
+ sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
+ spec:
+ initContainers:
+ - command: ["sh", "-c", "chown -R 100:101 /data"]
+ image: {{ include "repositoryGenerator.image.busybox" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-init
+ volumeMounts:
+ - mountPath: /data
+ name: artifact-data
+ containers:
+ - env:
+ - name: MSB_PROTO
+ value: {{ .Values.config.msbprotocol }}
+ - name: MSB_ADDR
+ value: "{{ .Values.config.msbgateway }}.{{ include "common.namespace" . }}"
+ - name: MSB_PORT
+ value: "{{ .Values.config.msbPort }}"
+ - name: AAI_ADDR
+ value: aai.{{ include "common.namespace" . }}
+ - name: AAI_PORT
+ value: "{{ .Values.config.aai.port }}"
+ - name: AAI_SCHEMA_VERSION
+ value: "{{ .Values.config.aai.schemaVersion }}"
+ - name: AAI_USERNAME
+ value: "{{ .Values.config.aai.username }}"
+ - name: AAI_PASSWORD
+ value: "{{ .Values.config.aai.password }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.config.ssl_enabled }}"
+ name: {{ include "common.name" . }}
+ volumeMounts:
+ - mountPath: /var/log/onap
+ name: windriver-log
+ - mountPath: /opt/windriver/titanium_cloud/pub/config/log.yml
+ name: windriver-logconfig
+ subPath: log.yml
+ - mountPath: /opt/artifacts/
+ name: artifact-data
+ resources: {{ include "common.resources" . | nindent 12 }}
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ ports:
+ - containerPort: {{ .Values.service.internalPort }}
+ # disable liveness probe when breakpoints set in debugger
+ # so K8s doesn't restart unresponsive container
+ {{ if .Values.liveness.enabled }}
+ livenessProbe:
+ httpGet:
+ path: /api/multicloud-titaniumcloud/v1/swagger.json
+ port: {{ .Values.service.internalPort }}
+ scheme: HTTPS
+ initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.liveness.periodSeconds }}
+ timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
+ successThreshold: {{ .Values.liveness.successThreshold }}
+ failureThreshold: {{ .Values.liveness.failureThreshold }}
+ {{ end }}
+ # side car containers
+ - image: {{ include "repositoryGenerator.image.logging" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: filebeat-onap
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ subPath: filebeat.yml
+ - mountPath: /var/log/onap
+ name: windriver-log
+ - mountPath: /usr/share/filebeat/data
+ name: windriver-data-filebeat
+ - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
+ name: framework-artifactbroker
+ command: ["/opt/app/distribution/bin/artifact-dist.sh"]
+ args: ["/opt/app/distribution/etc/mounted/config.json"]
+ ports:
+ - containerPort: 9014
+ protocol: TCP
+ volumeMounts:
+ - mountPath: /opt/app/distribution/etc/mounted/config.json
+ name: windriver-logconfig
+ subPath: config.json
+ - mountPath: /data
+ name: artifact-data
+
+ volumes:
+ - name: windriver-log
+ emptyDir: {}
+ - name: windriver-data-filebeat
+ emptyDir: {}
+ - name: filebeat-conf
+ configMap:
+ name: multicloud-filebeat-configmap
+ - name: windriver-logconfig
+ configMap:
+ name: {{ include "common.fullname" . }}-log-configmap
+ - name: artifact-data
+ {{- if .Values.persistence.enabled }}
+ persistentVolumeClaim:
+ claimName: {{ include "common.fullname" . }}
+ {{- else }}
+ emptyDir: {}
+ {{- end }}
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
+ restartPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/pv.yaml
index f798053f71..f798053f71 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/pv.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/pv.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/pvc.yaml
index 3c4d646638..3c4d646638 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/pvc.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/pvc.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
index 5a555b3222..5a555b3222 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/service.yaml
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
index 8ab4d56010..e25a96ba05 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/values.yaml
@@ -18,14 +18,13 @@
#################################################################
global:
nodePortPrefix: 302
- ubuntuInitRepository: oomk8s
- ubuntuInitImage: ubuntu-init:1.0.0
+ artifactImage: onap/multicloud/framework-artifactbroker:1.6.0
+ persistence: {}
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/multicloud/openstack-windriver:1.5.5
pullPolicy: Always
diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml
index caff1e5dc4..a37b9f7a83 100644
--- a/kubernetes/multicloud/requirements.yaml
+++ b/kubernetes/multicloud/requirements.yaml
@@ -17,3 +17,38 @@ dependencies:
- name: common
version: ~6.x-0
repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
+ - name: multicloud-azure
+ version: ~6.x-0
+ repository: 'file://components/multicloud-azure'
+ condition: multicloud-azure.enabled
+ - name: multicloud-fcaps
+ version: ~6.x-0
+ repository: 'file://components/multicloud-fcaps'
+ condition: multicloud-fcaps.enabled
+ - name: multicloud-k8s
+ version: ~6.x-0
+ repository: 'file://components/multicloud-k8s'
+ condition: multicloud-k8s.enabled
+ - name: multicloud-pike
+ version: ~6.x-0
+ repository: 'file://components/multicloud-pike'
+ condition: multicloud-pike.enabled
+ - name: multicloud-prometheus
+ version: ~6.x-0
+ repository: 'file://components/multicloud-prometheus'
+ condition: multicloud-prometheus.enabled
+ - name: multicloud-starlingx
+ version: ~6.x-0
+ repository: 'file://components/multicloud-starlingx'
+ condition: multicloud-starlingx.enabled
+ - name: multicloud-vio
+ version: ~6.x-0
+ repository: 'file://components/multicloud-vio'
+ condition: multicloud-vio.enabled
+ - name: multicloud-windriver
+ version: ~6.x-0
+ repository: 'file://components/multicloud-windriver'
+ condition: multicloud-windriver.enabled
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index 8cae0b66cd..a5b8297e2f 100644
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -59,7 +59,7 @@ spec:
value: "{{ .Values.config.ssl_enabled }}"
resources:
{{ include "common.resources" . | indent 12 }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}
volumeMounts:
@@ -89,7 +89,7 @@ spec:
{{ end -}}
# side car containers
- - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+ - image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: filebeat-onap
volumeMounts:
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 0ff561c800..12d5d6a046 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -18,8 +18,6 @@
#################################################################
global:
nodePortPrefix: 302
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
artifactImage: onap/multicloud/framework-artifactbroker:1.6.0
prometheus:
enabled: false
@@ -29,13 +27,29 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/multicloud/framework:1.6.0
pullPolicy: Always
#Istio sidecar injection policy
istioSidecar: true
+multicloud-azure:
+ enabled: true
+multicloud-fcaps:
+ enabled: true
+multicloud-k8s:
+ enabled: true
+multicloud-pike:
+ enabled: true
+multicloud-prometheus:
+ enabled: false
+multicloud-starlingx:
+ enabled: true
+multicloud-vio:
+ enabled: true
+multicloud-windriver:
+ enabled: true
+
# application configuration
config:
ssl_enabled: true