chore: adapt rabbitmq addon for API v1.0 (#1107)

addons/rabbitmq/templates/_helpers.tpl

@@ -5,24 +5,6 @@ Expand the name of the chart.
 {{- 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 "rabbitmq.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.
 */}}
@@ -51,41 +33,9 @@ app.kubernetes.io/name: {{ include "rabbitmq.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-
 {{/*
-Return rabbitmq service port
+Common annotations
 */}}
-{{- define "rabbitmq.service.port" -}}
-{{- .Values.primary.service.ports.rabbitmq -}}
-{{- end -}}
-
-{{/*
-Get the password key.
-*/}}
-{{- define "rabbitmq.password" -}}
-{{- if or (.Release.IsInstall) (not (lookup "apps.kubeblocks.io/v1alpha1" "ClusterDefinition" "" "rabbitmq")) -}}
-{{ .Values.auth.password | default "$(RANDOM_PASSWD)"}}
-{{- else -}}
-{{ index (lookup "apps.kubeblocks.io/v1alpha1" "ClusterDefinition" "" "rabbitmq").spec.connectionCredential "password"}}
-{{- end }}
+{{- define "rabbitmq.annotations" -}}
+helm.sh/resource-policy: keep              
 {{- end }}
-
-{{/*
-Check if cluster version is enabled, if enabledClusterVersions is empty, return true,
-otherwise, check if the cluster version is in the enabledClusterVersions list, if yes, return true,
-else return false.
-Parameters: cvName, values
-*/}}
-{{- define "rabbitmq.isClusterVersionEnabled" -}}
-{{- $cvName := .cvName -}}
-{{- $enabledClusterVersions := .values.enabledClusterVersions -}}
-{{- if eq (len $enabledClusterVersions) 0 -}}
-    {{- true -}}
-{{- else -}}
-    {{- range $enabledClusterVersions -}}
-        {{- if eq $cvName . -}}
-            {{- true -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- end -}}

addons/rabbitmq/templates/_names.tpl

@@ -10,14 +10,17 @@ rabbitmq
 {{- end -}}
 
 {{/*
-Define component definition name
+Define rabbitmq component definition name prefix
 */}}
-{{- define "rabbitmq.componentDefName" -}}
-{{- if eq (len .Values.resourceNamePrefix) 0 -}}
-rabbitmq
-{{- else -}}
-{{- .Values.resourceNamePrefix -}}
+{{- define "rabbitmq.cmpdNamePrefix" -}}
+{{- default "rabbitmq" .Values.resourceNamePrefix -}}-
 {{- end -}}
+
+{{/*
+Define rabbitmq component definition name
+*/}}
+{{- define "rabbitmq.cmpdName" -}}
+{{ include "rabbitmq.cmpdNamePrefix" . }}{{ .Chart.Version }}
 {{- end -}}
 
 {{/*

addons/rabbitmq/templates/clusterdefinition.yaml

@@ -0,0 +1,13 @@
+apiVersion: apps.kubeblocks.io/v1
+kind: ClusterDefinition
+metadata:
+  name: rabbitmq
+  labels:
+    {{- include "rabbitmq.labels" . | nindent 4 }}
+spec:
+  topologies:
+    - name: clustermode
+      components:
+        - name: rabbitmq
+          compDef: {{ include "rabbitmq.cmpdNamePrefix" . }}
+      default: true

addons/rabbitmq/templates/componentdefinition.yaml

@@ -1,9 +1,11 @@
 apiVersion: apps.kubeblocks.io/v1
 kind: ComponentDefinition
 metadata:
-  name: {{ include "rabbitmq.componentDefName" . }}
+  name: {{ include "rabbitmq.cmpdName" . }}
   labels:
     {{- include "rabbitmq.labels" . | nindent 4 }}
+  annotations:
+    {{- include "rabbitmq.annotations" . | nindent 4 }}
 spec:
   provider: kubeblocks.io
   description: RabbitMQ is a reliable and mature messaging and streaming broker.
@@ -69,7 +71,7 @@ spec:
         - name: RABBITMQ_USE_LONGNAME
           value: "true"
         - name: RABBITMQ_NODENAME
-          value: rabbit@$(KB_POD_NAME).$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE)
+          value: rabbit@$(MY_POD_NAME).$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE)
         - name: K8S_HOSTNAME_SUFFIX
           value: .$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE)
         image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -119,14 +121,14 @@ spec:
     - name: RABBITMQ_DEFAULT_USER
       valueFrom:
         credentialVarRef:
-          compDef: {{ include "rabbitmq.componentDefName" . }}
+          compDef: {{ include "rabbitmq.cmpdName" . }}
           name: root
           optional: false
           username: Required
     - name: RABBITMQ_DEFAULT_PASS
       valueFrom:
         credentialVarRef:
-          compDef: {{ include "rabbitmq.componentDefName" . }}
+          compDef: {{ include "rabbitmq.cmpdName" . }}
           name: root
           optional: false
           password: Required

addons/rabbitmq/templates/componentversion.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   compatibilityRules:
     - compDefs:
-        - {{ include "rabbitmq.componentDefName" . }}
+        - {{ include "rabbitmq.cmpdNamePrefix" . }}
       releases:
         - 3.13.2
         - 3.12.14

addons/rabbitmq/values.yaml

@@ -12,9 +12,7 @@ image:
 componentServiceVersion:
   rabbitmq: 3.13.2
 
-clusterVersionOverride: ""
 nameOverride: ""
-fullnameOverride: ""
 
 ## Authentication parameters
 ##
@@ -48,4 +46,4 @@ enabledClusterVersions: [ ]
 ## @param resourceNamePrefix Prefix for all resources name created by this chart, that can avoid name conflict
 ## if you install multiple releases of this chart.
 ## If specified, the cluster definition will use it as name.
-resourceNamePrefix: ""
+resourceNamePrefix: "rabbitmq"