chore: remove the rerender at h/v-scale of etcd (#1367)

apecloud · Dec 26, 2024 · c1eccaf · c1eccaf
1 parent a0a66f5
commit c1eccaf
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 87 deletions.
diff --git a/addons/etcd/opsdefinitions/defragmentation.yaml b/addons/etcd/opsdefinitions/defragmentation.yaml
diff --git a/addons/etcd/templates/_helpers.tpl b/addons/etcd/templates/_helpers.tpl
@@ -84,24 +84,17 @@ Define etcd component definition regular expression name prefix
 {{- end -}}
 
 {{/*
-Define etcd 3.X component configuration template name
+Define etcd 3.X component config template name
 */}}
-{{- define "etcd3.configurationTemplate" -}}
+{{- define "etcd3.configTemplate" -}}
 etcd3-config-template-{{ .Chart.Version }}
 {{- end }}
 
-{{/*
-Define etcd 3.X component config constriant name
-*/}}
-{{- define "etcd3.configConstraint" -}}
-etcd3-config-constraints
-{{- end }}
-
 {{/*
 Define etcd 3.X component script template name
 */}}
-{{- define "etcd3.scriptsTemplate" -}}
-etcd3-scripts-template-{{.Chart.Version}}
+{{- define "etcd3.scriptTemplate" -}}
+etcd3-script-template-{{.Chart.Version}}
 {{- end }}
 
 {{/*

diff --git a/addons/etcd/templates/cmpd.yaml b/addons/etcd/templates/cmpd.yaml
@@ -183,18 +183,14 @@ spec:
           - -c
           - /scripts/data-load.sh
   configs:
-    - name: etcd-configuration-tpl
-      templateRef: {{ include "etcd3.configurationTemplate" .}}
-      constraintRef: {{ include "etcd3.configConstraint" .}}
+    - name: etcd-config
+      templateRef: {{ include "etcd3.configTemplate" .}}
       namespace: {{ .Release.Namespace }}
       volumeName: config
       defaultMode: 0666
-      reRenderResourceTypes:
-        - hscale
-        - vscale
   scripts:
-    - name: etcd-scripts
-      templateRef: {{ include "etcd3.scriptsTemplate" .}}
+    - name: etcd-script
+      templateRef: {{ include "etcd3.scriptTemplate" .}}
       namespace: {{ .Release.Namespace }}
       volumeName: scripts
-      defaultMode: 0555
+      defaultMode: 0555
diff --git a/addons/etcd/templates/config-template.yaml b/addons/etcd/templates/config-template.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "etcd3.configurationTemplate" . }}
+  name: {{ include "etcd3.configTemplate" . }}
   labels:
     {{- include "etcd.labels" . | nindent 4 }}
   annotations:

diff --git a/addons/etcd/templates/configconstraint.yaml b/addons/etcd/templates/configconstraint.yaml
diff --git a/addons/etcd/templates/configmap-scripts.yaml → addons/etcd/templates/script-template.yaml b/addons/etcd/templates/configmap-scripts.yaml → addons/etcd/templates/script-template.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "etcd3.scriptsTemplate" . }}
+  name: {{ include "etcd3.scriptTemplate" . }}
   labels:
     {{- include "etcd.labels" . | nindent 4 }}
   annotations:
@@ -14,4 +14,4 @@ data:
     {{- include "kblib.strings.is_empty" $ | nindent 4 }}
   {{- with include "etcd.extend.scripts" . }}
   {{- . | nindent 2 }}
-  {{- end }}
+  {{- end }}