commit a81fd7834bcd3f78a075beb8f42664dba370485e
author Peter Zhu <starszcan@gmail.com> Fri Nov 03 14:29:36 2023 +0800
committer GitHub <noreply@github.com> Fri Nov 03 14:29:36 2023 +0800
tree 6a6b8829809c09a0b280858d3773d1bd4c677b88
parent 2461821486f42b1c4c800fd63c8b7f78bb0aa48b

fix: delete the condition of deployment role (#658)

charts/apisix/templates/configmap.yaml

diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
index 5f8843e..c79c366 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -296,7 +296,6 @@
 
     deployment:
       role: {{ .Values.deployment.role }}
-      {{- if or (eq .Values.deployment.role "traditional") (eq .Values.deployment.role "control_plane") }}
 
       {{- if eq .Values.deployment.role "traditional" }}
       role_traditional:
@@ -308,6 +307,11 @@
         config_provider: etcd
       {{- end }}
 
+      {{- if eq .Values.deployment.role "data_plane" }}
+      role_data_plane:
+        config_provider: etcd
+      {{- end }}
+
       admin:
         allow_admin:    # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
         {{- if .Values.admin.allow.ipList }}
@@ -348,7 +352,6 @@
             {{- end }}
             role: viewer
 
-      {{- if not (eq .Values.deployment.role "data_plane") }}
       etcd:
       {{- if .Values.etcd.enabled }}
         host:                          # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
@@ -373,13 +376,7 @@
           verify: {{ .Values.etcd.auth.tls.verify }}
           sni: "{{ .Values.etcd.auth.tls.sni }}"
         {{- end }}
-    {{- end }}
-    {{- end }}
       {{- end }}
 
-      {{- if eq .Values.deployment.role "data_plane" }}
-      role_data_plane:
-        config_provider: etcd
-      {{- end }}
-
+      
 {{- end }}