From 4b0b3a2dd5339329246e103e59cf197148c9a0cc Mon Sep 17 00:00:00 2001 From: Zhe Huang Date: Tue, 24 Mar 2020 11:40:07 -0400 Subject: [PATCH] Add xapp-onboarder into ric-common template Issue-ID: RIC-215 Signed-off-by: Zhe Huang Change-Id: I048c5531144ac49a72e45a173d9739c7edf4f57e --- bin/verify-ric-charts | 2 +- ric-aux/helm/dashboard/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/ves/requirements.yaml | 2 +- .../Common-Template/helm/ric-common/Chart.yaml | 2 +- .../helm/ric-common/templates/_appmgr.tpl | 6 -- .../helm/ric-common/templates/_xapp_onboarder.tpl | 65 ++++++++++++++++++++++ ric-dep | 2 +- 11 files changed, 74 insertions(+), 15 deletions(-) create mode 100644 ric-common/Common-Template/helm/ric-common/templates/_xapp_onboarder.tpl diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts index cf7b7a92..e193afc9 100755 --- a/bin/verify-ric-charts +++ b/bin/verify-ric-charts @@ -37,7 +37,7 @@ cp /tmp/ric-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/ AUX_COMMON_CHART_VERSION=$(cat $ROOT_DIR/../ric-common/Common-Template/helm/aux-common/Chart.yaml | grep version | awk '{print $2}') helm package -d /tmp $ROOT_DIR/../ric-common/Common-Template/helm/aux-common -cp /tmp/aux-common-$COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/ +cp /tmp/aux-common-$AUX_COMMON_CHART_VERSION.tgz $HELM_HOME/repository/local/ helm repo index $HELM_HOME/repository/local/ diff --git a/ric-aux/helm/dashboard/requirements.yaml b/ric-aux/helm/dashboard/requirements.yaml index db3a74ba..40a2e9bd 100644 --- a/ric-aux/helm/dashboard/requirements.yaml +++ b/ric-aux/helm/dashboard/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.0.0 + version: ~3.1.0 repository: "@local" diff --git a/ric-aux/helm/infrastructure/requirements.yaml b/ric-aux/helm/infrastructure/requirements.yaml index 3d535f4a..744e2750 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.0.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 db3a74ba..40a2e9bd 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.0.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 db3a74ba..40a2e9bd 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.0.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 db3a74ba..40a2e9bd 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.0.0 + version: ~3.1.0 repository: "@local" diff --git a/ric-aux/helm/ves/requirements.yaml b/ric-aux/helm/ves/requirements.yaml index db3a74ba..40a2e9bd 100644 --- a/ric-aux/helm/ves/requirements.yaml +++ b/ric-aux/helm/ves/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: ric-common - version: ~3.0.0 + version: ~3.1.0 repository: "@local" diff --git a/ric-common/Common-Template/helm/ric-common/Chart.yaml b/ric-common/Common-Template/helm/ric-common/Chart.yaml index 17aecc53..e2f199a2 100644 --- a/ric-common/Common-Template/helm/ric-common/Chart.yaml +++ b/ric-common/Common-Template/helm/ric-common/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: Common templates for inclusion in other charts name: ric-common -version: 3.0.0 +version: 3.1.0 diff --git a/ric-common/Common-Template/helm/ric-common/templates/_appmgr.tpl b/ric-common/Common-Template/helm/ric-common/templates/_appmgr.tpl index bdaf4bba..954ba3d0 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_appmgr.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_appmgr.tpl @@ -40,10 +40,6 @@ {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.containername.appmgr.chartmuseum" -}} - {{- $name := ( include "common.fullname.appmgr" . ) -}} - {{- printf "container-%s-helmrepo" $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} {{- define "common.serviceaccountname.appmgr" -}} {{- $name := ( include "common.fullname.appmgr" . ) -}} @@ -55,7 +51,6 @@ {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{- define "common.kongpath.ric.helmrepo" -}}/helmrepo{{- end -}} {{- define "common.kongpath.ric.appmgr" -}}/appmgr{{- end -}} {{- define "common.servicename.appmgr.rmr" -}} @@ -77,4 +72,3 @@ {{- define "common.serviceport.appmgr.rmr.route" -}}4561{{- end -}} {{- define "common.serviceport.appmgr.http" -}}8080{{- end -}} -{{- define "common.serviceport.appmgr.chartmuseum.http" -}}27015{{- end -}} diff --git a/ric-common/Common-Template/helm/ric-common/templates/_xapp_onboarder.tpl b/ric-common/Common-Template/helm/ric-common/templates/_xapp_onboarder.tpl new file mode 100644 index 00000000..357f3ea6 --- /dev/null +++ b/ric-common/Common-Template/helm/ric-common/templates/_xapp_onboarder.tpl @@ -0,0 +1,65 @@ +################################################################################ +# 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.xapp-onboarder" -}} + {{- printf "xapp-onboarder" -}} +{{- end -}} + +{{- define "common.fullname.xapp-onboarder" -}} + {{- $name := ( include "common.name.xapp-onboarder" . ) -}} + {{- $namespace := ( include "common.namespace.platform" . ) -}} + {{- printf "%s-%s" $namespace $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.configmapname.xapp-onboarder" -}} + {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}} + {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.deploymentname.xapp-onboarder" -}} + {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}} + {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.containername.xapp-onboarder" -}} + {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}} + {{- printf "container-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- define "common.containername.xapp-onboarder.chartmuseum" -}} + {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}} + {{- printf "container-%s-chartmuseum" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.serviceaccountname.xapp-onboarder" -}} + {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}} + {{- printf "svcacct-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.ingressname.xapp-onboarder" -}} + {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}} + {{- printf "ingress-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.servicename.xapp-onboarder.server" -}} + {{- $name := ( include "common.fullname.xapp-onboarder" . ) -}} + {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.serviceport.xapp-onboarder.server" -}}8888{{- end -}} +{{- define "common.serviceport.xapp-onboarder.chartmuseum" -}}8080{{- end -}} + +{{- define "common.kongpath.ric.xapp-onboarder" -}}/onboard{{- end -}} +{{- define "common.kongpath.ric.chartmuseum" -}}/helmrepo{{- end -}} diff --git a/ric-dep b/ric-dep index b6b82fd3..bc4d2b32 160000 --- a/ric-dep +++ b/ric-dep @@ -1 +1 @@ -Subproject commit b6b82fd34b2a09eb5c56db501f2dd1bc13290521 +Subproject commit bc4d2b325c496bbf2557b634ce70ba86ac353997 -- 2.16.6