From 6833ea37813f3429fac38db29c3e6be084cbf4d1 Mon Sep 17 00:00:00 2001 From: Kevin McDermott Date: Tue, 23 Dec 2025 16:00:50 -0700 Subject: [PATCH] Don't render any etcd resources if etcd is not being used --- charts/apisix/templates/deployment.yaml | 2 +- charts/apisix/templates/etcd-secret.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/apisix/templates/deployment.yaml b/charts/apisix/templates/deployment.yaml index acda6be7..39898385 100644 --- a/charts/apisix/templates/deployment.yaml +++ b/charts/apisix/templates/deployment.yaml @@ -92,7 +92,7 @@ spec: key: {{ include "apisix.admin.credentials.secretViewerKey" . }} {{- end }} - {{- if or (and .Values.etcd.enabled .Values.etcd.auth.rbac.create) (and (not .Values.etcd.enabled) .Values.externalEtcd.user) }} + {{- if and (or (and .Values.etcd.enabled .Values.etcd.auth.rbac.create) (and (not .Values.etcd.enabled) .Values.externalEtcd.user)) (or (and .Values.apisix.deployment.role_traditional (eq .Values.apisix.deployment.role_traditional.config_provider "etcd")) (and (not .Values.apisix.deployment.role_traditional) (or (and .Values.apisix.deployment.role_data_plane (eq .Values.apisix.deployment.role_data_plane.config_provider "etcd")) (and .Values.apisix.deployment.role_control_plane (eq .Values.apisix.deployment.role_control_plane.config_provider "etcd"))))) }} - name: APISIX_ETCD_PASSWORD valueFrom: secretKeyRef: diff --git a/charts/apisix/templates/etcd-secret.yaml b/charts/apisix/templates/etcd-secret.yaml index ffc15d88..4550a111 100644 --- a/charts/apisix/templates/etcd-secret.yaml +++ b/charts/apisix/templates/etcd-secret.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.externalEtcd.user (and (not .Values.etcd.enabled) (not .Values.externalEtcd.existingSecret)) }} +{{- if and (or (and .Values.etcd.enabled .Values.etcd.auth.rbac.create) (and (not .Values.etcd.enabled) .Values.externalEtcd.user)) (or (and .Values.apisix.deployment.role_traditional (eq .Values.apisix.deployment.role_traditional.config_provider "etcd")) (and .Values.apisix.deployment.role_data_plane (eq .Values.apisix.deployment.role_data_plane.config_provider "etcd")) (and .Values.apisix.deployment.role_control_plane (eq .Values.apisix.deployment.role_control_plane.config_provider "etcd"))) }} apiVersion: v1 kind: Secret metadata: