From 34c9b7e7d2d797e2e21793fd57071b9a853dca55 Mon Sep 17 00:00:00 2001 From: Zhe Huang Date: Thu, 9 Apr 2020 20:56:01 -0400 Subject: [PATCH] Update ric common template for DBAAS helm charts Signed-off-by: Zhe Huang Change-Id: I169cf6441f1bf5dd9a58dafddc2236ad0c6351ba --- ric-aux/helm/aaf/requirements.yaml | 2 +- ric-aux/helm/infrastructure/requirements.yaml | 2 +- .../certificate-manager/requirements.yaml | 2 +- .../subcharts/docker-credential/requirements.yaml | 2 +- .../subcharts/extsvcaux/requirements.yaml | 2 +- ric-aux/helm/message-router/requirements.yaml | 2 +- ric-aux/helm/portal/requirements.yaml | 2 +- .../helm/ric-common/templates/_dbaas.tpl | 11 ++-- .../helm/ric-common/templates/_dbaasha.tpl | 60 ---------------------- 9 files changed, 15 insertions(+), 70 deletions(-) delete mode 100644 ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl diff --git a/ric-aux/helm/aaf/requirements.yaml b/ric-aux/helm/aaf/requirements.yaml index c6409999..efb6c271 100755 --- a/ric-aux/helm/aaf/requirements.yaml +++ b/ric-aux/helm/aaf/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: aux-common - version: ~3.0.0 + version: ^3.0.0 repository: "@local" diff --git a/ric-aux/helm/infrastructure/requirements.yaml b/ric-aux/helm/infrastructure/requirements.yaml index 744e2750..2490dbf0 100644 --- a/ric-aux/helm/infrastructure/requirements.yaml +++ b/ric-aux/helm/infrastructure/requirements.yaml @@ -17,7 +17,7 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" - name: extsvcaux version: 0.2.0 diff --git a/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml b/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml +++ b/ric-aux/helm/infrastructure/subcharts/certificate-manager/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml b/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml +++ b/ric-aux/helm/infrastructure/subcharts/docker-credential/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml b/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml index 40a2e9bd..ba6a2203 100644 --- a/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml +++ b/ric-aux/helm/infrastructure/subcharts/extsvcaux/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.1.0 + version: ^3.1.0 repository: "@local" diff --git a/ric-aux/helm/message-router/requirements.yaml b/ric-aux/helm/message-router/requirements.yaml index c6409999..efb6c271 100755 --- a/ric-aux/helm/message-router/requirements.yaml +++ b/ric-aux/helm/message-router/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: aux-common - version: ~3.0.0 + version: ^3.0.0 repository: "@local" diff --git a/ric-aux/helm/portal/requirements.yaml b/ric-aux/helm/portal/requirements.yaml index 2032fd76..6e3dcafd 100755 --- a/ric-aux/helm/portal/requirements.yaml +++ b/ric-aux/helm/portal/requirements.yaml @@ -15,5 +15,5 @@ dependencies: - name: aux-common - version: ~3.0.0 + version: ^3.0.0 repository: "@local" diff --git a/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl index 54f9d286..9f3daca5 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_dbaas.tpl @@ -1,5 +1,5 @@ ################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # +# Copyright (c) 2020 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. # @@ -34,12 +34,16 @@ {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- define "common.statefulsetname.dbaas" -}} + {{- $name := ( include "common.fullname.dbaas" . ) -}} + {{- printf "statefulset-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + {{- define "common.containername.dbaas" -}} {{- $name := ( include "common.fullname.dbaas" . ) -}} {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} - {{- define "common.serviceaccountname.dbaas" -}} {{- $name := ( include "common.fullname.dbaas" . ) -}} {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}} @@ -50,4 +54,5 @@ {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.serviceport.dbaas.tcp" -}}6379{{- end -}} +{{- define "common.serviceport.dbaas.redis" -}}6379{{- end -}} +{{- define "common.serviceport.dbaas.sentinel" -}}26379{{- end -}} diff --git a/ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl b/ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl deleted file mode 100644 index b9480724..00000000 --- a/ric-common/Common-Template/helm/ric-common/templates/_dbaasha.tpl +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# 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. # -################################################################################ - -{{- define "common.name.dbaasha" -}} - {{- printf "dbaasha" -}} -{{- end -}} - -{{- define "common.fullname.dbaasha" -}} - {{- $name := ( include "common.name.dbaasha" . ) -}} - {{- $namespace := ( include "common.namespace.platform" . ) -}} - {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "common.configmapname.dbaasha" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "common.statefulsetname.dbaasha" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "statefulset-%s" $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "common.containername.dbaasha.redis" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "container-%s-redis" $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "common.containername.dbaasha.sentinel" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "container-%s-sentinel" $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - - - -{{- define "common.serviceaccountname.dbaasha" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "common.servicename.dbaasha.tcp" -}} - {{- $name := ( include "common.fullname.dbaasha" . ) -}} - {{- printf "service-%s-tcp" $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "common.serviceport.dbaasha.redis" -}}6379{{- end -}} -{{- define "common.serviceport.dbaasha.sentinel" -}}26379{{- end -}} -- 2.16.6