From 357bbfce42165b948b1a5afce60b9e356d003b07 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Fri, 18 Apr 2025 16:38:38 -0400 Subject: [PATCH] fix for operator --- kiali-operator/templates/_helpers.tpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kiali-operator/templates/_helpers.tpl b/kiali-operator/templates/_helpers.tpl index af02c83..195d39b 100644 --- a/kiali-operator/templates/_helpers.tpl +++ b/kiali-operator/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "kiali.name" -}} +{{- define "kiali-operator.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -11,7 +11,7 @@ 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 "kiali.fullname" -}} +{{- define "kiali-operator.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "kiali.chart" -}} +{{- define "kiali-operator.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "kiali.labels" -}} -helm.sh/chart: {{ include "kiali.chart" . }} -{{ include "kiali.selectorLabels" . }} +{{- define "kiali-operator.labels" -}} +helm.sh/chart: {{ include "kiali-operator.chart" . }} +{{ include "kiali-operator.selectorLabels" . }} {{- if .Chart.AppVersion }} version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} @@ -47,7 +47,7 @@ app.kubernetes.io/part-of: "kiali-operator" {{/* Selector labels */}} -{{- define "kiali.selectorLabels" -}} -app.kubernetes.io/name: {{ include "kiali.name" . }} +{{- define "kiali-operator.selectorLabels" -}} +app.kubernetes.io/name: {{ include "kiali-operator.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }}