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

apache · Nov 3, 2023 · 2965d83 · 2965d83
1 parent 5b4842b
commit 2965d83
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
@@ -282,7 +282,6 @@ data:
 
     deployment:
       role: {{ .Values.apisix.deployment.role }}
-      {{- if or (eq .Values.apisix.deployment.role "traditional") (eq .Values.apisix.deployment.role "control_plane") }}
 
       {{- if eq .Values.apisix.deployment.role "traditional" }}
       role_traditional:
@@ -294,6 +293,12 @@ data:
         config_provider: etcd
       {{- end }}
 
+      {{- if eq .Values.apisix.deployment.role "data_plane" }}
+      role_data_plane:
+        config_provider: etcd
+      {{- end }}
+
+      {{- if not (eq .Values.apisix.deployment.role "data_plane") }}
       admin:
         allow_admin:    # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
         {{- if .Values.apisix.admin.allow.ipList }}
@@ -333,8 +338,8 @@ data:
             key: {{ .Values.apisix.admin.credentials.viewer }}
             {{- end }}
             role: viewer
+      {{- end }}
 
-      {{- if not (eq .Values.apisix.deployment.role "data_plane") }}
       etcd:
       {{- if .Values.etcd.enabled }}
         host:                          # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
@@ -365,11 +370,5 @@ data:
           verify: {{ .Values.etcd.auth.tls.verify }}
           sni: "{{ .Values.etcd.auth.tls.sni }}"
         {{- end }}
-    {{- end }}
-    {{- end }}
-      {{- end }}
-
-      {{- if eq .Values.apisix.deployment.role "data_plane" }}
-      role_data_plane:
-        config_provider: etcd
       {{- end }}
+