fix: add multi version for pcr

Author: kizuna-lek

addons/elasticsearch/templates/_helpers.tpl

@@ -165,14 +165,6 @@ elasticsearch-7-config-tpl-{{ .Chart.Version }}
 elasticsearch-8-config-tpl-{{ .Chart.Version }}
 {{- end -}}
 
-{{- define "elasticsearch7.pcrName" -}}
-elasticsearch7-pcr
-{{- end }}
-
-{{- define "elasticsearch8.pcrName" -}}
-elasticsearch8-pcr
-{{- end }}
-
 {{- define "kibana6.cmpdName" -}}
 kibana-6-{{ .Chart.Version }}
 {{- end -}}

addons/etcd/templates/_helpers.tpl

@@ -97,12 +97,7 @@ Define etcd 3.X component parameters definition name
 etcd3-pd
 {{- end }}
 
-{{/*
-Define etcd 3.X component parameter config renderer name
-*/}}
-{{- define "etcd3.pcrName" -}}
-etcd3-pcr
-{{- end }}
+
 
 
 {{/*

addons/kafka/templates/_helpers.tpl

@@ -139,28 +139,28 @@ Define kafka-broker component definition regex pattern
 Define kafka parameter config renderer name
 */}}
 {{- define "kafka.brokerPCRName" -}}
-kafka-broker-pcr
+kafka-broker-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 {{/*
 Define kafka parameter config renderer name
 */}}
 {{- define "kafka.combinePCRName" -}}
-kafka-combine-pcr
+kafka-combine-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 {{/*
 Define kafka parameter config renderer name
 */}}
 {{- define "kafka.controllerPCRName" -}}
-kafka-controller-pcr
+kafka-controller-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 {{/*
 Define kafka parameter config renderer name
 */}}
 {{- define "kafka2.brokerPCRName" -}}
-kafka2-broker-pcr
+kafka2-broker-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 

addons/kafka/templates/pcr.yaml

@@ -4,6 +4,8 @@ metadata:
   name: {{ include "kafka.brokerPCRName" . }}
   labels:
     {{- include "kafka.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kafka.annotations" . | nindent 4 }}
 spec:
   componentDef: {{ include "kafka-broker.componentDefName" . }}
   parametersDefs:
@@ -19,6 +21,8 @@ metadata:
   name: {{ include "kafka2.brokerPCRName" . }}
   labels:
     {{- include "kafka.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kafka.annotations" . | nindent 4 }}
 spec:
   componentDef: {{ include "kafka2-broker.componentDefName" . }}
   parametersDefs:
@@ -34,6 +38,8 @@ metadata:
   name: {{ include "kafka.combinePCRName" . }}
   labels:
     {{- include "kafka.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kafka.annotations" . | nindent 4 }}
 spec:
   componentDef: {{ include "kafka-combine.componentDefName" . }}
   parametersDefs:
@@ -49,6 +55,8 @@ metadata:
   name: {{ include "kafka.controllerPCRName" . }}
   labels:
     {{- include "kafka.labels" . | nindent 4 }}
+  annotations:
+    {{- include "kafka.annotations" . | nindent 4 }}
 spec:
   componentDef: {{ include "kafka-controller.componentDefName" . }}
   parametersDefs:

addons/mogdb/templates/_helpers.tpl

@@ -100,13 +100,6 @@ Define mogdb parameters definition name
 mogdb-pd
 {{- end -}}
 
-{{/*
-Define mogdb parameter config rendered name
-*/}}
-{{- define "mogdb.pcrName" -}}
-mogdb-pcr
-{{- end -}}
-
 {{/*
 Generate scripts configmap
 */}}

addons/neo4j/templates/_names.tpl

@@ -23,13 +23,6 @@ Define neo4j component definition name
 {{ include "neo4j.cmpdNamePrefix" . }}{{ .Chart.Version }}
 {{- end -}}
 
-{{/*
-Define neo4j pcr definition name
-*/}}
-{{- define "neo4j.pcrName" -}}
-{{ include "neo4j.cmpdNamePrefix" . }}pcr
-{{- end -}}
-
 {{/*
 Define neo4j pcr definition name
 */}}

addons/pulsar/templates/_helpers.tpl

@@ -488,18 +488,18 @@ Define pulsar tools image
 Define pulsar v2.X bookies parameter config render name
 */}}
 {{- define "pulsar2.bookiesPCRName" -}}
-pulsar2-bookies-pcr
+pulsar2-bookies-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 {{/*
 Define pulsar v3.X bookies parameter config render name
 */}}
 {{- define "pulsar3.bookiesPCRName" -}}
-pulsar3-bookies-pcr
+pulsar3-bookies-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 {{- define "pulsar4.bookiesPCRName" -}}
-pulsar4-bookies-pcr
+pulsar4-bookies-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 {{/*

addons/qdrant/templates/_helpers.tpl

@@ -99,10 +99,3 @@ Define qdrant config constraint name
 {{- define "qdrant.configConstraintName" -}}
 qdrant-config-constraints
 {{- end -}}
-
-{{/*
-Define qdrant parameter config renderer name
-*/}}
-{{- define "qdrant.pcrName" -}}
-qdrant-pcr
-{{- end -}}

addons/rabbitmq/templates/_names.tpl

@@ -23,13 +23,6 @@ Define rabbitmq component definition name
 {{ include "rabbitmq.cmpdNamePrefix" . }}{{ .Chart.Version }}
 {{- end -}}
 
-{{/*
-Define rabbitmq pcr definition name
-*/}}
-{{- define "rabbitmq.pcrName" -}}
-{{ include "rabbitmq.cmpdNamePrefix" . }}pcr
-{{- end -}}
-
 {{/*
 Define rabbitmq pcr definition name
 */}}

addons/rocketmq/templates/_helpers.tpl

@@ -126,7 +126,7 @@ rocketmq-broker4-pd
 {{- end -}}
 
 {{- define "rocketmq-broker4.prcName" -}}
-rocketmq-broker4-pcr
+rocketmq-broker4-pcr-{{ .Chart.Version }}
 {{- end -}}
 
 {{/*