From 04d8123f5b80bddc11cc97c78e994589634a2c7b Mon Sep 17 00:00:00 2001 From: Zhe Huang Date: Sat, 22 Jun 2019 03:36:54 -0400 Subject: [PATCH] Add common template for all names for cross referencing. Allow individual repository overide in the override value yaml file. Signed-off-by: Zhe Huang Change-Id: Iea29da587dbcc3ab1e6a7d963f2a5aa1d936712a --- .../templates/_configmapname.tpl} | 47 ++++---- .../templates/_deploymentname.tpl} | 47 ++++---- .../helm/common/templates/_name.tpl | 125 ++++++++++++++++++++- .../helm/common/templates/_repository.tpl | 19 +++- .../templates/{_service.tpl => _servicename.tpl} | 32 +++++- .../helm/dbaas/templates/deployment.yaml | 2 +- .../helm/dbaas/templates/service.yaml | 2 +- .../helm/e2mgr/templates/configmap.yaml | 6 +- .../helm/e2mgr/templates/deployment.yaml | 4 +- .../helm/e2mgr/templates/service.yaml | 2 +- .../helm/e2term/templates/_helpers.tpl | 48 -------- .../helm/e2term/templates/configmap.yaml | 6 +- .../helm/e2term/templates/deployment.yaml | 4 +- .../helm/e2term/templates/service.yaml | 2 +- .../templates/{rtmgr-dep.yaml => deployment.yaml} | 2 +- .../templates/{rtmgr-svc.yaml => service.yaml} | 2 +- 16 files changed, 234 insertions(+), 116 deletions(-) rename ric-platform/50-RIC-Platform/helm/{rtmgr/templates/_helper.tpl => common/templates/_configmapname.tpl} (58%) rename ric-platform/50-RIC-Platform/helm/{e2mgr/templates/_helpers.tpl => common/templates/_deploymentname.tpl} (58%) rename ric-platform/50-RIC-Platform/helm/common/templates/{_service.tpl => _servicename.tpl} (65%) delete mode 100644 ric-platform/50-RIC-Platform/helm/e2term/templates/_helpers.tpl rename ric-platform/50-RIC-Platform/helm/rtmgr/templates/{rtmgr-dep.yaml => deployment.yaml} (98%) rename ric-platform/50-RIC-Platform/helm/rtmgr/templates/{rtmgr-svc.yaml => service.yaml} (97%) diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/_helper.tpl b/ric-platform/50-RIC-Platform/helm/common/templates/_configmapname.tpl similarity index 58% rename from ric-platform/50-RIC-Platform/helm/rtmgr/templates/_helper.tpl rename to ric-platform/50-RIC-Platform/helm/common/templates/_configmapname.tpl index 46334378..2e13e060 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/_helper.tpl +++ b/ric-platform/50-RIC-Platform/helm/common/templates/_configmapname.tpl @@ -15,36 +15,37 @@ # limitations under the License. # ################################################################################ -{{/* vim: set filetype=mustache: */}} {{/* -Expand the name of the chart. + Resolve the name of a chart's configmap. + */}} -{{- define "rtmgr.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} + + +{{- define "common.configmapname.appmgr" -}} + {{- $name := ( include "common.name.appmgr" . ) -}} + {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "rtmgr.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- define "common.configmapname.dbaas" -}} + {{- $name := ( include "common.name.dbaas" . ) -}} + {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "common.configmapname.e2mgr" -}} + {{- $name := ( include "common.name.e2mgr" . ) -}} + {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "common.configmapname.e2term" -}} + {{- $name := ( include "common.name.e2term" . ) -}} + {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "rtmgr.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- define "common.configmapname.rtmgr" -}} + {{- $name := ( include "common.name.rtmgr" . ) -}} + {{- printf "configmap-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + + + diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/_helpers.tpl b/ric-platform/50-RIC-Platform/helm/common/templates/_deploymentname.tpl similarity index 58% rename from ric-platform/50-RIC-Platform/helm/e2mgr/templates/_helpers.tpl rename to ric-platform/50-RIC-Platform/helm/common/templates/_deploymentname.tpl index 567cb589..7a43edca 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/_helpers.tpl +++ b/ric-platform/50-RIC-Platform/helm/common/templates/_deploymentname.tpl @@ -15,35 +15,36 @@ # limitations under the License. # ################################################################################ -{{/* vim: set filetype=mustache: */}} {{/* -Expand the name of the chart. + Resolve the name of a chart's deployment. */}} -{{- define "e2mgr.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} + + +{{- define "common.deploymentname.appmgr" -}} + {{- $name := ( include "common.name.appmgr" . ) -}} + {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "e2mgr.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- define "common.deploymentname.dbaas" -}} + {{- $name := ( include "common.name.dbaas" . ) -}} + {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "common.deploymentname.e2mgr" -}} + {{- $name := ( include "common.name.e2mgr" . ) -}} + {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{- define "common.deploymentname.e2term" -}} + {{- $name := ( include "common.name.e2term" . ) -}} + {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "e2mgr.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- define "common.deploymentname.rtmgr" -}} + {{- $name := ( include "common.name.rtmgr" . ) -}} + {{- printf "deployment-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + + + + diff --git a/ric-platform/50-RIC-Platform/helm/common/templates/_name.tpl b/ric-platform/50-RIC-Platform/helm/common/templates/_name.tpl index 200e9c31..7951a6d3 100644 --- a/ric-platform/50-RIC-Platform/helm/common/templates/_name.tpl +++ b/ric-platform/50-RIC-Platform/helm/common/templates/_name.tpl @@ -16,8 +16,131 @@ ################################################################################ {{/* - Expand the name of a chart. + This is the root file that define the name of each component. Value here will be used to define other K8S resource name. */}} + + + +{{- define "common.name.appmgr" -}} + {{- if .Values.appmgr -}} + {{- if .Values.appmgr.nameOverride -}} + {{- printf "%s" .Values.appmgr.nameOverride -}} + {{- else -}} + {{- printf "appmgr" -}} + {{- end -}} + {{- else -}} + {{- printf "appmgr" -}} + {{- end -}} +{{- end -}} + +{{- define "common.fullname.appmgr" -}} + {{- $name := ( include "common.name.appmgr" . ) -}} + {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + + +{{- define "common.name.dbaas" -}} + {{- if .Values.dbaas -}} + {{- if .Values.dbaas.nameOverride -}} + {{- printf "%s" .Values.dbaas.nameOverride -}} + {{- else -}} + {{- printf "dbaas" -}} + {{- end -}} + {{- else -}} + {{- printf "dbaas" -}} + {{- end -}} +{{- end -}} + +{{- define "common.fullname.dbaas" -}} + {{- $name := ( include "common.name.dbaas" . ) -}} + {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + + + + + + + + + + + +{{- define "common.name.e2mgr" -}} + {{- if .Values.e2mgr -}} + {{- if .Values.e2mgr.nameOverride -}} + {{- printf "%s" .Values.e2mgr.nameOverride -}} + {{- else -}} + {{- printf "e2mgr" -}} + {{- end -}} + {{- else -}} + {{- printf "e2mgr" -}} + {{- end -}} +{{- end -}} + + +{{- define "common.fullname.e2mgr" -}} + {{- $name := ( include "common.name.e2mgr" . ) -}} + {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.name.e2term" -}} + {{- if .Values.e2term -}} + {{- if .Values.e2term.nameOverride -}} + {{- printf "%s" .Values.e2term.nameOverride -}} + {{- else -}} + {{- printf "e2term" -}} + {{- end -}} + {{- else -}} + {{- printf "e2term" -}} + {{- end -}} +{{- end -}} + + +{{- define "common.fullname.e2term" -}} + {{- $name := ( include "common.name.e2term" . ) -}} + {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + + + + + + + + + +{{- define "common.name.rtmgr" -}} + {{- if .Values.rtmgr -}} + {{- if .Values.rtmgr.nameOverride -}} + {{- printf "%s" .Values.rtmgr.nameOverride -}} + {{- else -}} + {{- printf "rtmgr" -}} + {{- end -}} + {{- else -}} + {{- printf "rtmgr" -}} + {{- end -}} +{{- end -}} + + +{{- define "common.fullname.rtmgr" -}} + {{- $name := ( include "common.name.rtmgr" . ) -}} + {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + + + + + + + + + + + + + + {{- define "common.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/ric-platform/50-RIC-Platform/helm/common/templates/_repository.tpl b/ric-platform/50-RIC-Platform/helm/common/templates/_repository.tpl index 6058df41..07969988 100644 --- a/ric-platform/50-RIC-Platform/helm/common/templates/_repository.tpl +++ b/ric-platform/50-RIC-Platform/helm/common/templates/_repository.tpl @@ -24,8 +24,23 @@ - .Values.repositoryOverride : override global and default image repository on a per image basis */}} {{- define "common.repository" -}} - {{- if .Values.repositoryOverride -}} - {{- printf "%s" .Values.repositoryOverride -}} + {{- $componentname := .Chart.Name -}} + {{- $firsttier := (index .Values (printf "%s" $componentname)) -}} + {{- if $firsttier -}} + {{- $secondtier := (index .Values (printf "%s" $componentname) (printf "%s" "repositoryOverride")) -}} + {{- if $secondtier -}} + {{- printf "%s" $secondtier -}} + {{- else -}} + {{- if .Values.global -}} + {{- if .Values.global.repository -}} + {{- printf "%s" .Values.global.repository -}} + {{- else -}} + {{- printf "%s" .Values.repository -}} + {{- end -}} + {{- else -}} + {{- printf "%s" .Values.repository -}} + {{- end -}} + {{- end -}} {{- else -}} {{- if .Values.global -}} {{- if .Values.global.repository -}} diff --git a/ric-platform/50-RIC-Platform/helm/common/templates/_service.tpl b/ric-platform/50-RIC-Platform/helm/common/templates/_servicename.tpl similarity index 65% rename from ric-platform/50-RIC-Platform/helm/common/templates/_service.tpl rename to ric-platform/50-RIC-Platform/helm/common/templates/_servicename.tpl index 5403effb..f6ed74fb 100644 --- a/ric-platform/50-RIC-Platform/helm/common/templates/_service.tpl +++ b/ric-platform/50-RIC-Platform/helm/common/templates/_servicename.tpl @@ -26,7 +26,33 @@ {{/* Expand the service name for a chart. */}} -{{- define "common.servicename" -}} - {{- $name := default .Chart.Name .Values.nameOverride -}} - {{- default $name .Values.service.name | trunc 63 | trimSuffix "-" -}} + + +{{- define "common.servicename.appmgr" -}} + {{- $name := ( include "common.name.appmgr" . ) -}} + {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.servicename.dbaas" -}} + {{- $name := ( include "common.name.dbaas" . ) -}} + {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.servicename.e2mgr" -}} + {{- $name := ( include "common.name.e2mgr" . ) -}} + {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.servicename.e2term" -}} + {{- $name := ( include "common.name.e2term" . ) -}} + {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{- define "common.servicename.rtmgr" -}} + {{- $name := ( include "common.name.rtmgr" . ) -}} + {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + + + + diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml index 8d2014fc..135b2c27 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml @@ -18,7 +18,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "dbaas.fullname" . }} + name: {{ include "common.deploymentname.dbaas" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml index 0708b0c9..c87ddf37 100644 --- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "dbaas.fullname" . }} + name: {{ include "common.servicename.dbaas" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml index 7ccc8a66..fcfe9a0c 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/configmap.yaml @@ -19,11 +19,11 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "e2mgr.fullname" . }}-router-configmap + name: {{ include "common.configmapname.e2mgr" . }}-router-configmap namespace: {{ include "common.namespace" . }} data: router.txt: | newrt|start - rte|1001|ric-full-e2term:38000 - rte|2002|{{ include "e2mgr.fullname" .}}:3801 + rte|1001|{{ include "common.servicename.e2term" .}}:38000 + rte|2002|{{ include "common.servicename.e2mgr" .}}:3801 newrt|end diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml index f5726a3e..08360458 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml @@ -18,7 +18,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "e2mgr.fullname" .}} + name: {{ include "common.deploymentname.e2mgr" .}} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -63,4 +63,4 @@ spec: volumes: - name: local-router-file configMap: - name: {{ include "e2mgr.fullname" . }}-router-configmap + name: {{ include "common.configmapname.e2mgr" . }}-router-configmap diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml index d2a2a80c..2eb580ff 100644 --- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "e2mgr.fullname" . }} + name: {{ include "common.servicename.e2mgr" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/_helpers.tpl b/ric-platform/50-RIC-Platform/helm/e2term/templates/_helpers.tpl deleted file mode 100644 index c1cd9509..00000000 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/_helpers.tpl +++ /dev/null @@ -1,48 +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. # -################################################################################ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "e2term.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "e2term.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "e2term.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml index edd24ed7..832b2635 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/configmap.yaml @@ -19,11 +19,11 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "e2term.fullname" . }}-router-configmap + name: {{ include "common.configmapname.e2term" . }}-router-configmap namespace: {{ include "common.namespace" . }} data: router.txt: | newrt|start - rte|1001|{{ include "e2term.fullname" . }}:38000 - rte|2002|ric-full-e2mgr:3801 + rte|1001|{{ include "common.configmapname.e2term" . }}:38000 + rte|2002|{{ include "common.configmapname.e2mgr" . }}:3801 newrt|end diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml index 82b1b728..c090c364 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml @@ -18,7 +18,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "e2term.fullname" . }} + name: {{ include "common.deploymentname.e2term" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} @@ -69,4 +69,4 @@ spec: volumes: - name: local-router-file configMap: - name: {{ include "e2term.fullname" . }}-router-configmap + name: {{ include "common.configmapname.e2term" . }}-router-configmap diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml index b46de3d0..c3332f13 100644 --- a/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml +++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "e2term.fullname" . }} + name: {{ include "common.servicename.e2term" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml similarity index 98% rename from ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml rename to ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml index 7c1ad885..afeff191 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-dep.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml @@ -18,7 +18,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "rtmgr.fullname" . }} + name: {{ include "common.deploymentname.rtmgr" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service.yaml similarity index 97% rename from ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml rename to ric-platform/50-RIC-Platform/helm/rtmgr/templates/service.yaml index b1080674..3f0dc98a 100644 --- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/rtmgr-svc.yaml +++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "rtmgr.fullname" . }} + name: {{ include "common.servicename.rtmgr" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.namespace" . }}-{{ include "common.name" . }} -- 2.16.6