X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-common%2FCommon-Template%2Fhelm%2Fric-common%2Ftemplates%2F_helmrepo.tpl;fp=ric-common%2FCommon-Template%2Fhelm%2Fric-common%2Ftemplates%2F_helmrepo.tpl;h=6d28d22eb00edd8299bba1268e0d7df729ff2fa9;hb=75b5b699748ed990eb8996652efef950eee5d9b9;hp=c662cf53eb13489e5f7d71963991dbec89746d7b;hpb=5e94a66d5dc9ec584ab7b40f5ac983b724b2119b;p=it%2Fdep.git diff --git a/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl b/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl index c662cf53..6d28d22e 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_helmrepo.tpl @@ -91,82 +91,6 @@ {{- end -}} -{{/* - Resolve the helm repository tiller service name. - The tiller should be installed by K8S system admin. - The value for .Values.helmRepositoryTiller is used by default, - unless either override mechanism is used. - - - .Values.global.helmrepositoryTiller : override default helm repository tiller - - .Values.helmRepositoryTillerOverride : override global and default helm repository tiller -*/}} -{{- define "common.helmrepositorytiller" -}} - {{- if .Values.helmRepositoryTillerOverride -}} - {{- printf "%s" .Values.helmRepositoryTillerOverride -}} - {{- else -}} - {{- if .Values.global -}} - {{- if .Values.global.helmRepositoryTiller -}} - {{- printf "%s" .Values.global.helmRepositoryTiller -}} - {{- else -}} - {{- printf "%s" .Values.helmRepositoryTiller -}} - {{- end -}} - {{- else -}} - {{- printf "%s" .Values.helmRepositoryTiller -}} - {{- end -}} - {{- end -}} -{{- end -}} - - -{{/* - Resolve the helm repository tiller service namespace. - The tiller should be installed by K8S system admin. - The value for .Values.helmRepositoryTillerNamespace is used by default, - unless either override mechanism is used. - - - .Values.global.helmrepositoryTillerNamespace : override default helm repository tiller namespace - - .Values.helmRepositoryTillerNamespaceOverride : override global and default helm repository tiller namespace -*/}} -{{- define "common.helmrepositorytillernamespace" -}} - {{- if .Values.helmRepositoryTillerNamespaceOverride -}} - {{- printf "%s" .Values.helmRepositoryTillerNamespaceOverride -}} - {{- else -}} - {{- if .Values.global -}} - {{- if .Values.global.helmRepositoryTillerNamespace -}} - {{- printf "%s" .Values.global.helmRepositoryTillerNamespace -}} - {{- else -}} - {{- printf "%s" .Values.helmRepositoryTillerNamespace -}} - {{- end -}} - {{- else -}} - {{- printf "%s" .Values.helmRepositoryTillerNamespace -}} - {{- end -}} - {{- end -}} -{{- end -}} - - -{{/* - Resolve the helm repository tiller service port. - The tiller should be installed by K8S system admin. - The value for .Values.helmRepositoryTillerPort is used by default, - unless either override mechanism is used. - - - .Values.global.helmrepositoryTillerPort : override default helm repository tiller port - - .Values.helmRepositoryTillerPortOverride : override global and default helm repository tiller port -*/}} -{{- define "common.helmrepositorytillerport" -}} - {{- if .Values.helmRepositoryTillerPortOverride -}} - {{- printf "%.0f" .Values.helmRepositoryTillerPortOverride -}} - {{- else -}} - {{- if .Values.global -}} - {{- if .Values.global.helmRepositoryTillerPort -}} - {{- printf "%.0f" .Values.global.helmRepositoryTillerPort -}} - {{- else -}} - {{- printf "%.0f" .Values.helmRepositoryTillerPort -}} - {{- end -}} - {{- else -}} - {{- printf "%.0f" .Values.helmRepositoryTillerPort -}} - {{- end -}} - {{- end -}} -{{- end -}} {{/* Generate certificates for the helm repo