From 6f157d7b84f5c957c068146a300f25fd0983375f Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 25 Jul 2019 06:32:02 -0400 Subject: [PATCH] Verify helm charts with client lint and template In a docker, install helm client, package up common dependency, copy to every chart, then run helm lint and helm template to verify chart contents, with output to stdout. Signed-off-by: Lott, Christopher (cl778h) Change-Id: Id2e46152b405da91d3b3b6388dc87e5f1696d779 --- bin/verify-ric-charts | 77 +++++++++ ci/Dockerfile | 25 +++ .../helm/kong-aux/Chart.yaml | 2 +- .../charts/message-router-kafka/.helmignore | 21 --- .../charts/message-router-kafka/Chart.yaml | 23 --- .../templates/poddisruptionbudget.yaml | 28 ---- .../charts/message-router-kafka/templates/pv.yaml | 39 ----- .../message-router-kafka/templates/service-hs.yaml | 34 ---- .../message-router-kafka/templates/service.yaml | 39 ----- .../templates/statefulset.yaml | 179 --------------------- .../charts/message-router-kafka/values.yaml | 140 ---------------- .../charts/message-router-zookeeper/.helmignore | 21 --- .../charts/message-router-zookeeper/Chart.yaml | 22 --- .../templates/_zkquorum.tpl | 34 ---- .../templates/poddisruptionbudget.yaml | 28 ---- .../message-router-zookeeper/templates/pv.yaml | 39 ----- .../templates/service.yaml | 38 ----- .../templates/statefulset.yaml | 150 ----------------- .../charts/message-router-zookeeper/values.yaml | 138 ---------------- ric-common/Docker-Credential/bin/install | 6 +- .../helm/{ => docker-credential}/Chart.yaml | 0 .../helm/{ => docker-credential}/requirements.yaml | 0 .../{ => docker-credential}/templates/_helper.tpl | 0 .../templates/secrets-docker-reg.yaml | 0 .../helm/{ => docker-credential}/values.yaml | 0 ric-common/Helm-Credential/bin/install | 10 +- .../helm/helm-credential}/Chart.yaml | 2 +- .../helm/{ => helm-credential}/requirements.yaml | 0 .../{ => helm-credential}/templates/_helper.tpl | 0 .../templates/config-helm-cert.yaml | 0 .../templates/secrets-helm-xapp.yaml | 0 .../helm/{ => helm-credential}/values.yaml | 0 ric-infra/10-Nexus/helm/{ => nexus}/Chart.yaml | 0 .../10-Nexus/helm/{ => nexus}/requirements.yaml | 0 .../helm/{ => nexus}/templates/_gen-cert.tpl | 0 .../helm/{ => nexus}/templates/deployment.yaml | 0 .../helm/{ => nexus}/templates/docker-ingress.yaml | 0 .../helm/{ => nexus}/templates/helm-ingress.yaml | 0 .../helm/{ => nexus}/templates/job-save-certs.yaml | 0 .../helm/{ => nexus}/templates/nexus-ingress.yaml | 0 .../{ => nexus}/templates/persistentVolume.yaml | 0 .../templates/persistentVolumeClaim.yaml | 0 .../helm/{ => nexus}/templates/secret-docker.yaml | 0 .../helm/{ => nexus}/templates/secret-helm.yaml | 0 .../helm/{ => nexus}/templates/secret-nexus.yaml | 0 .../helm/{ => nexus}/templates/service.yaml | 0 .../helm/{ => nexus}/templates/storageClass.yaml | 0 ric-infra/10-Nexus/helm/{ => nexus}/values.yaml | 0 ric-infra/20-Monitoring/helm/elfkp/Chart.yaml | 2 +- ric-infra/40-Credential/bin/install | 20 +-- .../40-Credential/helm/credential}/Chart.yaml | 0 .../helm/{ => credential}/requirements.yaml | 0 .../helm/{ => credential}/templates/_helper.tpl | 0 .../templates/config-helm-cert.yaml | 0 .../templates/secrets-docker-reg.yaml | 0 .../templates/secrets-helm-xapp.yaml | 0 .../helm/{ => credential}/values.yaml | 0 .../50-RIC-Platform/helm/kong-platform/Chart.yaml | 2 +- .../50-RIC-Platform/helm/kong-xapp/Chart.yaml | 2 +- 59 files changed, 125 insertions(+), 996 deletions(-) create mode 100755 bin/verify-ric-charts create mode 100644 ci/Dockerfile delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/.helmignore delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/Chart.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/poddisruptionbudget.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/pv.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service-hs.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/statefulset.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/values.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/.helmignore delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/Chart.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/_zkquorum.tpl delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/poddisruptionbudget.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/pv.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/service.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/statefulset.yaml delete mode 100644 ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/values.yaml rename ric-common/Docker-Credential/helm/{ => docker-credential}/Chart.yaml (100%) rename ric-common/Docker-Credential/helm/{ => docker-credential}/requirements.yaml (100%) rename ric-common/Docker-Credential/helm/{ => docker-credential}/templates/_helper.tpl (100%) rename ric-common/Docker-Credential/helm/{ => docker-credential}/templates/secrets-docker-reg.yaml (100%) rename ric-common/Docker-Credential/helm/{ => docker-credential}/values.yaml (100%) rename {ric-infra/40-Credential/helm => ric-common/Helm-Credential/helm/helm-credential}/Chart.yaml (98%) rename ric-common/Helm-Credential/helm/{ => helm-credential}/requirements.yaml (100%) rename ric-common/Helm-Credential/helm/{ => helm-credential}/templates/_helper.tpl (100%) rename ric-common/Helm-Credential/helm/{ => helm-credential}/templates/config-helm-cert.yaml (100%) rename ric-common/Helm-Credential/helm/{ => helm-credential}/templates/secrets-helm-xapp.yaml (100%) rename ric-common/Helm-Credential/helm/{ => helm-credential}/values.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/Chart.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/requirements.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/_gen-cert.tpl (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/deployment.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/docker-ingress.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/helm-ingress.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/job-save-certs.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/nexus-ingress.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/persistentVolume.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/persistentVolumeClaim.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/secret-docker.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/secret-helm.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/secret-nexus.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/service.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/templates/storageClass.yaml (100%) rename ric-infra/10-Nexus/helm/{ => nexus}/values.yaml (100%) rename {ric-common/Helm-Credential/helm => ric-infra/40-Credential/helm/credential}/Chart.yaml (100%) rename ric-infra/40-Credential/helm/{ => credential}/requirements.yaml (100%) rename ric-infra/40-Credential/helm/{ => credential}/templates/_helper.tpl (100%) rename ric-infra/40-Credential/helm/{ => credential}/templates/config-helm-cert.yaml (100%) rename ric-infra/40-Credential/helm/{ => credential}/templates/secrets-docker-reg.yaml (100%) rename ric-infra/40-Credential/helm/{ => credential}/templates/secrets-helm-xapp.yaml (100%) rename ric-infra/40-Credential/helm/{ => credential}/values.yaml (100%) diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts new file mode 100755 index 00000000..fa4d6904 --- /dev/null +++ b/bin/verify-ric-charts @@ -0,0 +1,77 @@ +#!/bin/bash +############################################################################## +# +# Copyright (c) 2019 AT&T Intellectual Property. +# +# 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. +# +############################################################################## + +# Installs well-known RIC charts then verifies specified helm chart +# Requires chart tgz archives in /tmp +OVERRIDEYAML=$1 + +ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" +TEMP_DIR=/tmp +CHART_ARRAY=() +while IFS= read -r -d $'\0'; do + CHART_ARRAY+=("$REPLY") +done < <(find $ROOT_DIR/../ -name Chart.yaml -printf '%h\0') + +rm -fr $TEMP_DIR/ric-common*.tgz + +helm package -d $TEMP_DIR $ROOT_DIR/../ric-common/Common-Template/helm/ric-common +echo "***************************************" + + + +for dir in "${CHART_ARRAY[@]}" +do + + rm -r $dir/charts + rm -r $dir/tmpcharts + mkdir -p $dir/charts + cp $TEMP_DIR/ric-common*.tgz $dir/charts/ + + echo "Update chart depenedency" + helm dep up $dir + # Lint clearly marks errors; e.g., [ERROR] + if [ -z $OVERRIDEYAML ]; then + helm lint $dir > /tmp/output 2>&1 + else + helm lint -f $OVERRIDEYAML $dir> /tmp/output 2>&1 + fi + echo "***************************************************************************************************************" + cat /tmp/output + + egrep -q '^Error: [0-9]* chart\(s\) linted, [0-9]* chart\(s\) failed' /tmp/output && exit 1 + echo "***************************************************************************************************************" + + if [ -z $OVERRIDEYAML ]; then + helm template $dir > /tmp/output 2>&1 + else + helm template -f $OVERRIDEYAML $dir > /tmp/output 2>&1 + fi + echo "***************************************************************************************************************" + cat /tmp/output + sleep 1 + egrep -n '%!.\(.*=.*\)' /tmp/output && echo "Error: Type mismatch." && exit 1 + echo "***************************************************************************************************************" + +done +#Error: 1 chart(s) linted, 1 chart(s) failed + + + +exit 0 + diff --git a/ci/Dockerfile b/ci/Dockerfile new file mode 100644 index 00000000..bd60013b --- /dev/null +++ b/ci/Dockerfile @@ -0,0 +1,25 @@ +############################################################################## +# +# Copyright (c) 2019 AT&T Intellectual Property. +# +# 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. +# +############################################################################## + +FROM ubuntu:18.04 +RUN apt-get update && apt-get -y install curl +RUN curl -L https://git.io/get_helm.sh | bash +RUN helm init -c +ARG TGT=/tmp/it-dep +COPY . $TGT +RUN $TGT/bin/verify-ric-charts diff --git a/ric-aux/80-Auxiliary-Functions/helm/kong-aux/Chart.yaml b/ric-aux/80-Auxiliary-Functions/helm/kong-aux/Chart.yaml index caf0bbb2..b1eb9550 100644 --- a/ric-aux/80-Auxiliary-Functions/helm/kong-aux/Chart.yaml +++ b/ric-aux/80-Auxiliary-Functions/helm/kong-aux/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes -name: kong_aux +name: kong-aux version: 1.0.0 diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/.helmignore b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/.helmignore deleted file mode 100644 index f0c13194..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/Chart.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/Chart.yaml deleted file mode 100644 index 50be1b4d..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/Chart.yaml +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# 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: v1 -description: ONAP Message Router Kafka Service -name: message-router-kafka -version: 1.1.0 - diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/poddisruptionbudget.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/poddisruptionbudget.yaml deleted file mode 100644 index 5c2db8c1..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/poddisruptionbudget.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 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: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: {{ include "common.fullname" . }}-pdb - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - selector: - matchLabels: - app: {{ include "common.name" . }} - maxUnavailable: 1 diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/pv.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/pv.yaml deleted file mode 100644 index 44c9576a..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/pv.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, 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. - -{{- $root := . -}} -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} -{{ range $i, $e := until (atoi (quote $root.Values.replicaCount) | default 3) }} ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: {{ $root.Release.Name }}-{{ $root.Values.service.name }}-{{ $i }} - namespace: {{ $root.Release.Namespace }} - labels: - app: {{ $root.Values.service.name }} - chart: {{ $root.Chart.Name }}-{{ $root.Chart.Version | replace "+" "_" }} - release: {{ $root.Release.Name }} - heritage: {{ $root.Release.Service }} -spec: - capacity: - storage: {{ $root.Values.persistence.size }} - accessModes: - - {{ $root.Values.persistence.accessMode }} - hostPath: - path: {{ $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }} - persistentVolumeReclaimPolicy: {{ $root.Values.persistence.volumeReclaimPolicy }} -{{ end }} -{{ end }} - diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service-hs.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service-hs.yaml deleted file mode 100644 index 0dabe55e..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service-hs.yaml +++ /dev/null @@ -1,34 +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: v1 -kind: Service -metadata: - name: {{ .Values.service.name }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - ports: - - port: {{ .Values.service.internalPort }} - name: {{ .Values.service.portName }} - clusterIP: None - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service.yaml deleted file mode 100644 index 8200eda6..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/service.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2019 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. - -{{- $root := . -}} -{{ range $i, $e := until (atoi (quote $root.Values.replicaCount) | default 3) }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ $root.Values.service.name }}-{{ $i }} - namespace: {{ $root.Release.Namespace }} - labels: - app: {{ $root.Values.service.name }} - chart: {{ $root.Chart.Name }}-{{ $root.Chart.Version | replace "+" "_" }} - release: {{ $root.Release.Name }} - heritage: {{ $root.Release.Service }} - -spec: - type: {{ $root.Values.service.type }} - externalTrafficPolicy: Local - selector: - statefulset.kubernetes.io/pod-name: {{ $root.Release.Name }}-{{ $root.Values.service.name }}-{{ $i }} - ports: - - port: {{ $root.Values.service.externalPort }} - targetPort: {{ $root.Values.service.externalPort }} - nodePort: {{ $root.Values.service.baseNodePort | add $i }} - name: {{ $root.Values.service.name }}-{{ $i }} -{{ end }} diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/statefulset.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/statefulset.yaml deleted file mode 100644 index 0e38ed5a..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/templates/statefulset.yaml +++ /dev/null @@ -1,179 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# 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/v1beta1 -kind: StatefulSet -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - serviceName: {{ .Values.service.name }} - replicas: {{ .Values.replicaCount }} - podManagementPolicy: Parallel - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: - podAntiAffinity: - {{if eq .Values.podAntiAffinityType "hard" -}} - requiredDuringSchedulingIgnoredDuringExecution: - {{- else -}} - preferredDuringSchedulingIgnoredDuringExecution: - {{- end}} - - weight: 1 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: "app" - operator: In - values: - - {{ include "common.name" . }} - topologyKey: "kubernetes.io/hostname" - {{- if .Values.nodeAffinity }} - nodeAffinity: - {{ toYaml .Values.nodeAffinity | indent 10 }} - {{- end }} - initContainers: - - name: {{ include "common.name" . }}-initcontainer - image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.ubuntuInitImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - - command: - - sh - - -exec - - | - chown -R 1000:1000 /opt/kafka/data; - image: "{{ .Values.busyBoxRepository }}/{{ .Values.busyBoxImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - mountPath: /opt/kafka/data - name: kafka-data - name: {{ include "common.name" . }}-permission-fixer - containers: - - name: {{ include "common.name" . }} - image: "{{ .Values.onapRepository }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - command: - - sh - - -exc - - | - export KAFKA_BROKER_ID=${HOSTNAME##*-} && \ - export ENDPOINT_PORT=$(( $KAFKA_BROKER_ID + {{ .Values.service.baseNodePort }} )) && \ - export KAFKA_ADVERTISED_LISTENERS=EXTERNAL_SASL_PLAINTEXT://$(HOST_IP):$(( $KAFKA_BROKER_ID + {{ .Values.service.baseNodePort }} )),INTERNAL_SASL_PLAINTEXT://:{{ .Values.service.internalPort }} && \ - exec start-kafka.sh - resources: -{{ include "common.resources" . | indent 12 }} - ports: - - containerPort: {{ .Values.service.internalPort }} - - containerPort: {{ .Values.service.externalPort }} - {{ if eq .Values.liveness.enabled true }} - livenessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end }} - readinessProbe: - tcpSocket: - port: {{ .Values.service.internalPort }} - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - env: - - name: HOST_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.hostIP - - name: KAFKA_ZOOKEEPER_CONNECT - value: "{{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}" - - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP - value: "INTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT,EXTERNAL_SASL_PLAINTEXT:SASL_PLAINTEXT" - - name: KAFKA_LISTENERS - value: "EXTERNAL_SASL_PLAINTEXT://0.0.0.0:{{ .Values.service.externalPort }},INTERNAL_SASL_PLAINTEXT://0.0.0.0:{{ .Values.service.internalPort }}" - - name: KAFKA_INTER_BROKER_LISTENER_NAME - value: "INTERNAL_SASL_PLAINTEXT" - - name: KAFKA_SASL_ENABLED_MECHANISMS - value: "PLAIN" - - name: KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL - value: "PLAIN" - - name: KAFKA_AUTHORIZER_CLASS_NAME - value: "{{ .Values.kafkaCustomAuthorizer }}" - - name: KAFKA_DELETE_TOPIC_ENABLE - value: "{{ .Values.deleteTopicEnable }}" - - name: aaf_locate_url - value: "https://aaf-locate:8095" - - name: KAFKA_LOG_DIRS - value: "/opt/kafka/data" - - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR - value: "{{ .Values.replicaCount }}" - - name: KAFKA_DEFAULT_REPLICATION_FACTOR - value: "{{ .Values.replicaCount }}" - - name: KAFKA_NUM_PARTITIONS - value: "{{ .Values.defaultpartitions }}" - volumeMounts: - - mountPath: /etc/localtime - name: localtime - readOnly: true - - mountPath: /var/run/docker.sock - name: docker-socket - - mountPath: /opt/kafka/data - name: kafka-data - {{- if .Values.tolerations }} - tolerations: - {{ toYaml .Values.tolerations | indent 10 }} - {{- end }} - volumes: - - name: localtime - hostPath: - path: /etc/localtime - - name: docker-socket - hostPath: - path: /var/run/docker.sock -{{ if not .Values.persistence.enabled }} - - name: kafka-data - emptyDir: {} -{{ else }} - volumeClaimTemplates: - - metadata: - name: kafka-data - labels: - app: {{ include "common.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} - selector: - matchLabels: - release: "{{ .Release.Name }}" - app: {{ .Values.service.name }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: "{{ .Release.Service }}" -{{ end }} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/values.yaml deleted file mode 100644 index f765ebba..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-kafka/values.yaml +++ /dev/null @@ -1,140 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# 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. # -################################################################################ - - -################################################################# -# Global configuration defaults. -################################################################# -global: - nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - persistence: {} - ubuntuInitRepository: registry.hub.docker.com - -################################################################# -# Application configuration defaults. -################################################################# -# application image -onapRepository: nexus3.onap.org:10001 -image: onap/dmaap/kafka111:1.0.0 -pullPolicy: Always -ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 -busyBoxImage: busybox:1.30 -busyBoxRepository: docker.io - - -zookeeper: - name: message-router-zookeeper - port: 2181 - -# flag to enable debugging - application support required -debugEnabled: false - -# default number of instances -replicaCount: 3 - -#Kafka custom authorizer class name -kafkaCustomAuthorizer: org.onap.dmaap.kafkaAuthorize.KafkaCustomAuthorizer -deleteTopicEnable: true - -# To access Kafka outside cluster, this value must be set to hard and the number of nodes in K8S cluster must be equal or greater then replica count -podAntiAffinityType: soft - -# defult partitions -defaultpartitions: 3 - -nodeSelector: {} - -nodeAffinity: {} - -affinity: {} - -tolerations: {} - - - -# probe configuration parameters -liveness: - initialDelaySeconds: 60 - periodSeconds: 10 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: true - -readiness: - initialDelaySeconds: 60 - periodSeconds: 10 - -## Persist data to a persitent volume -persistence: - enabled: false - - ## A manually managed Persistent Volume and Claim - ## Requires persistence.enabled: true - ## If defined, PVC must be created manually before volume will be bound - # existingClaim: - volumeReclaimPolicy: Retain - - ## database data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteMany - size: 2Gi - mountPath: /dockerdata-nfs - mountSubPath: message-router/data-kafka - -service: - type: NodePort - name: message-router-kafka - portName: message-router-kafka - internalPort: 9092 - externalPort: 9093 - baseNodePort: 30490 - - - -ingress: - enabled: false - -# Resource Limit flavor -By Default using small -flavor: small -# Segregation for Different environment (Small and Large) -resources: - small: - limits: - cpu: 2000m - memory: 4Gi - requests: - cpu: 100m - memory: 1Gi - large: - limits: - cpu: 4000m - memory: 8Gi - requests: - cpu: 200m - memory: 2Gi - unlimited: {} - diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/.helmignore b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/.helmignore deleted file mode 100644 index f0c13194..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/Chart.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/Chart.yaml deleted file mode 100644 index 5e9c6fa4..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/Chart.yaml +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# 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: v1 -description: ONAP Dmaap Message Router Zookeeper Service -name: message-router-zookeeper -version: 1.1.0 \ No newline at end of file diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/_zkquorum.tpl b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/_zkquorum.tpl deleted file mode 100644 index 9af910eb..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/_zkquorum.tpl +++ /dev/null @@ -1,34 +0,0 @@ -{{/* -# Copyright © 2019 Amdocs, Bell Canada -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -*/}} - -{{- /* - Calculate the maximum number of zk server down in order to guarantee ZK quorum. - For guaranteeing ZK quorum we need half of the server + 1 up. - - div in go template cast return an int64 - so we need to know if it is an even number or an odd. - For this we are doing (n/2)*2=n? - if true it is even else it is even -*/ -}} -{{- define "zk.maxUnavailable" -}} -{{- $halfReplica := div .Values.replicaCount 2 -}} - {{/* divide by 2 and multiply by 2 in order to know if it is an even number*/}} - {{if eq (mul $halfReplica 2) (int .Values.replicaCount) }} - {{- toYaml (sub $halfReplica 1) -}} - {{else}} - {{- toYaml $halfReplica -}} - {{end}} -{{- end -}} diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/poddisruptionbudget.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/poddisruptionbudget.yaml deleted file mode 100644 index 5a370cdc..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/poddisruptionbudget.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# 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: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: {{ include "common.fullname" . }}-pdb - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - selector: - matchLabels: - app: {{ include "common.name" . }} - maxUnavailable: {{ include "zk.maxUnavailable" . }} diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/pv.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/pv.yaml deleted file mode 100644 index 44c9576a..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/pv.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, 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. - -{{- $root := . -}} -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} -{{ range $i, $e := until (atoi (quote $root.Values.replicaCount) | default 3) }} ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: {{ $root.Release.Name }}-{{ $root.Values.service.name }}-{{ $i }} - namespace: {{ $root.Release.Namespace }} - labels: - app: {{ $root.Values.service.name }} - chart: {{ $root.Chart.Name }}-{{ $root.Chart.Version | replace "+" "_" }} - release: {{ $root.Release.Name }} - heritage: {{ $root.Release.Service }} -spec: - capacity: - storage: {{ $root.Values.persistence.size }} - accessModes: - - {{ $root.Values.persistence.accessMode }} - hostPath: - path: {{ $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }} - persistentVolumeReclaimPolicy: {{ $root.Values.persistence.volumeReclaimPolicy }} -{{ end }} -{{ end }} - diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/service.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/service.yaml deleted file mode 100644 index da494b0b..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/service.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright © 2018 Amdocs, AT&T, 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: v1 -kind: Service -metadata: - name: {{ .Values.service.name }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.clientPort }} - name: {{ .Values.service.clientPortName }} - - port: {{ .Values.service.serverPort }} - name: {{ .Values.service.serverPortName }} - - port: {{ .Values.service.leaderElectionPort }} - name: {{ .Values.service.leaderElectionPortName }} - clusterIP: None - selector: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} \ No newline at end of file diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/statefulset.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/statefulset.yaml deleted file mode 100644 index 61f0a35e..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/templates/statefulset.yaml +++ /dev/null @@ -1,150 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# 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/v1beta1 -kind: StatefulSet -metadata: - name: {{ include "common.fullname" . }} - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - serviceName: {{ .Values.service.name }} - replicas: {{ .Values.replicaCount }} - updateStrategy: - type: RollingUpdate - rollingUpdate: - maxUnavailable: {{ .Values.maxUnavailable }} - podManagementPolicy: Parallel - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: "app" - operator: In - values: - - {{ include "common.name" . }} - topologyKey: "kubernetes.io/hostname" - {{- if .Values.nodeAffinity }} - nodeAffinity: - {{ toYaml .Values.nodeAffinity | indent 10 }} - {{- end }} - initContainers: - - name: {{ include "common.name" . }}-permission-fixer - command: - - sh - - -exec - - > - chown -R 1000:1000 /tmp/zookeeper/apikeys; - image: "{{ .Values.busyBoxRepository }}/{{ .Values.busyBoxImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - mountPath: /tmp/zookeeper/apikeys - name: zookeeper-data - containers: - - name: {{ include "common.name" . }} - image: "{{ .Values.onapRepository }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - resources: -{{ include "common.resources" . | indent 12 }} - ports: - - containerPort: {{ .Values.service.clientPort }} - name: {{ .Values.service.clientPortName }} - - containerPort: {{ .Values.service.serverPort }} - name: {{ .Values.service.serverPortName }} - - containerPort: {{ .Values.service.leaderElectionPort }} - name: {{ .Values.service.leaderElectionPortName }} - {{ if eq .Values.liveness.enabled true }} - livenessProbe: - exec: - command: - - sh - - -c - - "zookeeper-ready.sh 2181" - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{ end }} - readinessProbe: - exec: - command: - - sh - - -c - - "zookeeper-ready.sh 2181" - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - env: - - name: ZK_REPLICAS - value: "{{ .Values.replicaCount }}" - - name: ZK_INIT_LIMIT - value: "{{ .Values.zk.initLimit }}" - - name: ZK_SYNC_LIMIT - value: "{{ .Values.zk.syncLimit }}" - volumeMounts: - - mountPath: /etc/localtime - name: localtime - readOnly: true - - mountPath: /var/lib/zookeeper/data - name: zookeeper-data - {{- if .Values.tolerations }} - tolerations: - {{ toYaml .Values.tolerations | indent 10 }} - {{- end }} - volumes: - - name: localtime - hostPath: - path: /etc/localtime -{{ if not .Values.persistence.enabled }} - - name: zookeeper-data - emptyDir: {} -{{ else }} - volumeClaimTemplates: - - metadata: - name: zookeeper-data - labels: - app: {{ include "common.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} - selector: - matchLabels: - release: "{{ .Release.Name }}" - app: {{ .Values.service.name }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: "{{ .Release.Service }}" -{{ end }} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" - - diff --git a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/values.yaml deleted file mode 100644 index c93dd697..00000000 --- a/ric-aux/80-Auxiliary-Functions/helm/message-router/charts/message-router-zookeeper/values.yaml +++ /dev/null @@ -1,138 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# 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. # -################################################################################ - - -################################################################# -# Global configuration defaults. -################################################################# -global: - nodePortPrefix: 302 - readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - ubuntuInitRepository: registry.hub.docker.com - persistence: {} - -################################################################# -# Application configuration defaults. -################################################################# -# application image -onapRepository: nexus3.onap.org:10001 -image: onap/dmaap/zookeeper:5.0.0 -pullPolicy: Always -ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 -busyBoxImage: busybox:1.30 -busyBoxRepository: docker.io - -# flag to enable debugging - application support required -debugEnabled: false - -# application configuration -config: - # gerrit branch where the latest code is checked in - gerritBranch: master - # gerrit project where the latest code is checked in - gerritProject: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git - -# default number of instances -replicaCount: 3 - -nodeSelector: {} - -nodeAffinity: {} - -affinity: {} - -tolerations: {} - -# probe configuration parameters -liveness: - initialDelaySeconds: 10 - periodSeconds: 10 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: true - -readiness: - initialDelaySeconds: 10 - periodSeconds: 10 - -#Zookeeper properties -zk: - initLimit: 5 - syncLimit: 2 - -## Persist data to a persitent volume -persistence: - enabled: false - - ## A manually managed Persistent Volume and Claim - ## Requires persistence.enabled: true - ## If defined, PVC must be created manually before volume will be bound - # existingClaim: - volumeReclaimPolicy: Retain - - ## database data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteMany - size: 2Gi - mountPath: /dockerdata-nfs - mountSubPath: message-router/data-zookeeper - - -rollingUpdate: - maxUnavailable: 1 -service: - type: ClusterIP - name: message-router-zookeeper - portName: message-router-zookeeper - clientPortName: client - clientPort: 2181 - serverPortName: server - serverPort: 2888 - leaderElectionPortName: leader-election - leaderElectionPort: 3888 - -ingress: - enabled: false - -# Resource Limit flavor -By Default using small -flavor: small -# Segregation for Different environment (Small and Large) -resources: - small: - limits: - cpu: 2000m - memory: 4Gi - requests: - cpu: 100m - memory: 1Gi - large: - limits: - cpu: 4000m - memory: 8Gi - requests: - cpu: 200m - memory: 2Gi - unlimited: {} diff --git a/ric-common/Docker-Credential/bin/install b/ric-common/Docker-Credential/bin/install index fadb3e69..010a026d 100755 --- a/ric-common/Docker-Credential/bin/install +++ b/ric-common/Docker-Credential/bin/install @@ -44,9 +44,9 @@ COMMON_CHART_VERSION=$(cat $DIR/../../Common-Template/helm/ric-common/Chart.yaml helm package -d /tmp $DIR/../../Common-Template/helm/ric-common -mkdir -p $DIR/../helm/charts/ -cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/charts/ +mkdir -p $DIR/../helm/docker-credential/charts/ +cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/docker-credential/charts/ -helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-cred-${NAMESPACE}-${DOCKERREG_NORMALIZED}" --set repository="$DOCKERREG" --set repositoryCredential.user="$DOCKERUSERNAME" --set repositoryCredential.password="$DOCKERPASSWORD" $DIR/../helm +helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-cred-${NAMESPACE}-${DOCKERREG_NORMALIZED}" --set repository="$DOCKERREG" --set repositoryCredential.user="$DOCKERUSERNAME" --set repositoryCredential.password="$DOCKERPASSWORD" $DIR/../helm/docker-credential diff --git a/ric-common/Docker-Credential/helm/Chart.yaml b/ric-common/Docker-Credential/helm/docker-credential/Chart.yaml similarity index 100% rename from ric-common/Docker-Credential/helm/Chart.yaml rename to ric-common/Docker-Credential/helm/docker-credential/Chart.yaml diff --git a/ric-common/Docker-Credential/helm/requirements.yaml b/ric-common/Docker-Credential/helm/docker-credential/requirements.yaml similarity index 100% rename from ric-common/Docker-Credential/helm/requirements.yaml rename to ric-common/Docker-Credential/helm/docker-credential/requirements.yaml diff --git a/ric-common/Docker-Credential/helm/templates/_helper.tpl b/ric-common/Docker-Credential/helm/docker-credential/templates/_helper.tpl similarity index 100% rename from ric-common/Docker-Credential/helm/templates/_helper.tpl rename to ric-common/Docker-Credential/helm/docker-credential/templates/_helper.tpl diff --git a/ric-common/Docker-Credential/helm/templates/secrets-docker-reg.yaml b/ric-common/Docker-Credential/helm/docker-credential/templates/secrets-docker-reg.yaml similarity index 100% rename from ric-common/Docker-Credential/helm/templates/secrets-docker-reg.yaml rename to ric-common/Docker-Credential/helm/docker-credential/templates/secrets-docker-reg.yaml diff --git a/ric-common/Docker-Credential/helm/values.yaml b/ric-common/Docker-Credential/helm/docker-credential/values.yaml similarity index 100% rename from ric-common/Docker-Credential/helm/values.yaml rename to ric-common/Docker-Credential/helm/docker-credential/values.yaml diff --git a/ric-common/Helm-Credential/bin/install b/ric-common/Helm-Credential/bin/install index 00e11bc8..60b6d9d1 100755 --- a/ric-common/Helm-Credential/bin/install +++ b/ric-common/Helm-Credential/bin/install @@ -31,7 +31,7 @@ HELMCERTPATH=$5 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" -cp $HELMCERTPATH $DIR/../helm/cert/tls.crt +cp $HELMCERTPATH $DIR/../helm/helm-credential/cert/tls.crt source $DIR/../etc/credential.conf @@ -46,10 +46,10 @@ COMMON_CHART_VERSION=$(cat $DIR/../../Common-Template/helm/ric-common/Chart.yaml helm package -d /tmp $DIR/../../Common-Template/helm/ric-common -mkdir -p $DIR/../helm/charts/ -cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/charts/ +mkdir -p $DIR/../helm/helm-credential/charts/ +cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/helm-credential/charts/ -helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-cred-${NAMESPACE}-${HELMREPO_NORMALIZED}" --set helmrepo="$HELMREPO" --set helmrepoCredential.user="$DOCKERUSERNAME" --set helmrepoCredential.password="$DOCKERPASSWORD" $DIR/../helm +helm install --namespace "${NAMESPACE}" --name "${RELEASE_NAME}-cred-${NAMESPACE}-${HELMREPO_NORMALIZED}" --set helmrepo="$HELMREPO" --set helmrepoCredential.user="$DOCKERUSERNAME" --set helmrepoCredential.password="$DOCKERPASSWORD" $DIR/../helm/helm-credential -rm $DIR/../helm/cert/tls.crt +rm $DIR/../helm/helm-credential/cert/tls.crt diff --git a/ric-infra/40-Credential/helm/Chart.yaml b/ric-common/Helm-Credential/helm/helm-credential/Chart.yaml similarity index 98% rename from ric-infra/40-Credential/helm/Chart.yaml rename to ric-common/Helm-Credential/helm/helm-credential/Chart.yaml index 69bdcc4c..17b41bb5 100644 --- a/ric-infra/40-Credential/helm/Chart.yaml +++ b/ric-common/Helm-Credential/helm/helm-credential/Chart.yaml @@ -18,5 +18,5 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for setting up k8s resources for accessing external and infrastructure resources before RIC deployment" -name: credential +name: helm-credential version: 1.1.0 diff --git a/ric-common/Helm-Credential/helm/requirements.yaml b/ric-common/Helm-Credential/helm/helm-credential/requirements.yaml similarity index 100% rename from ric-common/Helm-Credential/helm/requirements.yaml rename to ric-common/Helm-Credential/helm/helm-credential/requirements.yaml diff --git a/ric-common/Helm-Credential/helm/templates/_helper.tpl b/ric-common/Helm-Credential/helm/helm-credential/templates/_helper.tpl similarity index 100% rename from ric-common/Helm-Credential/helm/templates/_helper.tpl rename to ric-common/Helm-Credential/helm/helm-credential/templates/_helper.tpl diff --git a/ric-common/Helm-Credential/helm/templates/config-helm-cert.yaml b/ric-common/Helm-Credential/helm/helm-credential/templates/config-helm-cert.yaml similarity index 100% rename from ric-common/Helm-Credential/helm/templates/config-helm-cert.yaml rename to ric-common/Helm-Credential/helm/helm-credential/templates/config-helm-cert.yaml diff --git a/ric-common/Helm-Credential/helm/templates/secrets-helm-xapp.yaml b/ric-common/Helm-Credential/helm/helm-credential/templates/secrets-helm-xapp.yaml similarity index 100% rename from ric-common/Helm-Credential/helm/templates/secrets-helm-xapp.yaml rename to ric-common/Helm-Credential/helm/helm-credential/templates/secrets-helm-xapp.yaml diff --git a/ric-common/Helm-Credential/helm/values.yaml b/ric-common/Helm-Credential/helm/helm-credential/values.yaml similarity index 100% rename from ric-common/Helm-Credential/helm/values.yaml rename to ric-common/Helm-Credential/helm/helm-credential/values.yaml diff --git a/ric-infra/10-Nexus/helm/Chart.yaml b/ric-infra/10-Nexus/helm/nexus/Chart.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/Chart.yaml rename to ric-infra/10-Nexus/helm/nexus/Chart.yaml diff --git a/ric-infra/10-Nexus/helm/requirements.yaml b/ric-infra/10-Nexus/helm/nexus/requirements.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/requirements.yaml rename to ric-infra/10-Nexus/helm/nexus/requirements.yaml diff --git a/ric-infra/10-Nexus/helm/templates/_gen-cert.tpl b/ric-infra/10-Nexus/helm/nexus/templates/_gen-cert.tpl similarity index 100% rename from ric-infra/10-Nexus/helm/templates/_gen-cert.tpl rename to ric-infra/10-Nexus/helm/nexus/templates/_gen-cert.tpl diff --git a/ric-infra/10-Nexus/helm/templates/deployment.yaml b/ric-infra/10-Nexus/helm/nexus/templates/deployment.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/deployment.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/deployment.yaml diff --git a/ric-infra/10-Nexus/helm/templates/docker-ingress.yaml b/ric-infra/10-Nexus/helm/nexus/templates/docker-ingress.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/docker-ingress.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/docker-ingress.yaml diff --git a/ric-infra/10-Nexus/helm/templates/helm-ingress.yaml b/ric-infra/10-Nexus/helm/nexus/templates/helm-ingress.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/helm-ingress.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/helm-ingress.yaml diff --git a/ric-infra/10-Nexus/helm/templates/job-save-certs.yaml b/ric-infra/10-Nexus/helm/nexus/templates/job-save-certs.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/job-save-certs.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/job-save-certs.yaml diff --git a/ric-infra/10-Nexus/helm/templates/nexus-ingress.yaml b/ric-infra/10-Nexus/helm/nexus/templates/nexus-ingress.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/nexus-ingress.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/nexus-ingress.yaml diff --git a/ric-infra/10-Nexus/helm/templates/persistentVolume.yaml b/ric-infra/10-Nexus/helm/nexus/templates/persistentVolume.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/persistentVolume.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/persistentVolume.yaml diff --git a/ric-infra/10-Nexus/helm/templates/persistentVolumeClaim.yaml b/ric-infra/10-Nexus/helm/nexus/templates/persistentVolumeClaim.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/persistentVolumeClaim.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/persistentVolumeClaim.yaml diff --git a/ric-infra/10-Nexus/helm/templates/secret-docker.yaml b/ric-infra/10-Nexus/helm/nexus/templates/secret-docker.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/secret-docker.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/secret-docker.yaml diff --git a/ric-infra/10-Nexus/helm/templates/secret-helm.yaml b/ric-infra/10-Nexus/helm/nexus/templates/secret-helm.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/secret-helm.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/secret-helm.yaml diff --git a/ric-infra/10-Nexus/helm/templates/secret-nexus.yaml b/ric-infra/10-Nexus/helm/nexus/templates/secret-nexus.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/secret-nexus.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/secret-nexus.yaml diff --git a/ric-infra/10-Nexus/helm/templates/service.yaml b/ric-infra/10-Nexus/helm/nexus/templates/service.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/service.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/service.yaml diff --git a/ric-infra/10-Nexus/helm/templates/storageClass.yaml b/ric-infra/10-Nexus/helm/nexus/templates/storageClass.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/templates/storageClass.yaml rename to ric-infra/10-Nexus/helm/nexus/templates/storageClass.yaml diff --git a/ric-infra/10-Nexus/helm/values.yaml b/ric-infra/10-Nexus/helm/nexus/values.yaml similarity index 100% rename from ric-infra/10-Nexus/helm/values.yaml rename to ric-infra/10-Nexus/helm/nexus/values.yaml diff --git a/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml b/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml index 2b9762c0..b81f82e7 100644 --- a/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml +++ b/ric-infra/20-Monitoring/helm/elfkp/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 description: A Helm chart for metric and monitoring (ELFK stack and Prometheus) for RIC -name: ric-elfkp +name: elfkp version: 0.0.1 appVersion: 0.1 maintainers: diff --git a/ric-infra/40-Credential/bin/install b/ric-infra/40-Credential/bin/install index 9d547d0d..af9a258f 100755 --- a/ric-infra/40-Credential/bin/install +++ b/ric-infra/40-Credential/bin/install @@ -62,19 +62,19 @@ COMMON_CHART_VERSION=$(cat $DIR/../../../ric-common/Common-Template/helm/ric-com helm package -d /tmp $DIR/../../../ric-common/Common-Template/helm/ric-common -mkdir -p $DIR/../helm/charts/ -cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/charts/ +mkdir -p $DIR/../helm/credential/charts/ +cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $DIR/../helm/credential/charts/ if [ -z $OVERRIDEYAML ]; then - helm install --namespace "${PLT_NAMESPACE}" --name "${RELEASE_NAME}-${PLT_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm - helm install --namespace "${XAPP_NAMESPACE}" --name "${RELEASE_NAME}-${XAPP_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm - helm install --namespace "${AUX_NAMESPACE}" --name "${RELEASE_NAME}-${AUX_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm - helm install --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-${INFRA_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm + helm install --namespace "${PLT_NAMESPACE}" --name "${RELEASE_NAME}-${PLT_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential + helm install --namespace "${XAPP_NAMESPACE}" --name "${RELEASE_NAME}-${XAPP_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential + helm install --namespace "${AUX_NAMESPACE}" --name "${RELEASE_NAME}-${AUX_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential + helm install --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-${INFRA_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential else - helm install -f $OVERRIDEYAML --namespace "${PLT_NAMESPACE}" --name "${RELEASE_NAME}-${PLT_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm - helm install -f $OVERRIDEYAML --namespace "${XAPP_NAMESPACE}" --name "${RELEASE_NAME}-${XAPP_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm - helm install -f $OVERRIDEYAML --namespace "${AUX_NAMESPACE}" --name "${RELEASE_NAME}-${AUX_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm - helm install -f $OVERRIDEYAML --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-${INFRA_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm + helm install -f $OVERRIDEYAML --namespace "${PLT_NAMESPACE}" --name "${RELEASE_NAME}-${PLT_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential + helm install -f $OVERRIDEYAML --namespace "${XAPP_NAMESPACE}" --name "${RELEASE_NAME}-${XAPP_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential + helm install -f $OVERRIDEYAML --namespace "${AUX_NAMESPACE}" --name "${RELEASE_NAME}-${AUX_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential + helm install -f $OVERRIDEYAML --namespace "${INFRA_NAMESPACE}" --name "${RELEASE_NAME}-${INFRA_NAMESPACE}-credential" $COMMON_OVERRIDE $DIR/../helm/credential fi diff --git a/ric-common/Helm-Credential/helm/Chart.yaml b/ric-infra/40-Credential/helm/credential/Chart.yaml similarity index 100% rename from ric-common/Helm-Credential/helm/Chart.yaml rename to ric-infra/40-Credential/helm/credential/Chart.yaml diff --git a/ric-infra/40-Credential/helm/requirements.yaml b/ric-infra/40-Credential/helm/credential/requirements.yaml similarity index 100% rename from ric-infra/40-Credential/helm/requirements.yaml rename to ric-infra/40-Credential/helm/credential/requirements.yaml diff --git a/ric-infra/40-Credential/helm/templates/_helper.tpl b/ric-infra/40-Credential/helm/credential/templates/_helper.tpl similarity index 100% rename from ric-infra/40-Credential/helm/templates/_helper.tpl rename to ric-infra/40-Credential/helm/credential/templates/_helper.tpl diff --git a/ric-infra/40-Credential/helm/templates/config-helm-cert.yaml b/ric-infra/40-Credential/helm/credential/templates/config-helm-cert.yaml similarity index 100% rename from ric-infra/40-Credential/helm/templates/config-helm-cert.yaml rename to ric-infra/40-Credential/helm/credential/templates/config-helm-cert.yaml diff --git a/ric-infra/40-Credential/helm/templates/secrets-docker-reg.yaml b/ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml similarity index 100% rename from ric-infra/40-Credential/helm/templates/secrets-docker-reg.yaml rename to ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml diff --git a/ric-infra/40-Credential/helm/templates/secrets-helm-xapp.yaml b/ric-infra/40-Credential/helm/credential/templates/secrets-helm-xapp.yaml similarity index 100% rename from ric-infra/40-Credential/helm/templates/secrets-helm-xapp.yaml rename to ric-infra/40-Credential/helm/credential/templates/secrets-helm-xapp.yaml diff --git a/ric-infra/40-Credential/helm/values.yaml b/ric-infra/40-Credential/helm/credential/values.yaml similarity index 100% rename from ric-infra/40-Credential/helm/values.yaml rename to ric-infra/40-Credential/helm/credential/values.yaml diff --git a/ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml b/ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml index 4bd2e363..f00a2cdc 100644 --- a/ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml +++ b/ric-platform/50-RIC-Platform/helm/kong-platform/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes -name: kong_platform +name: kong-platform version: 1.0.0 diff --git a/ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml b/ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml index 25b4aad7..15b32a09 100644 --- a/ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml +++ b/ric-platform/50-RIC-Platform/helm/kong-xapp/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes -name: kong_xapp +name: kong-xapp version: 1.0.0 -- 2.16.6