diff --git a/charts/apisix/README.md b/charts/apisix/README.md index fc951f34..1c064f92 100644 --- a/charts/apisix/README.md +++ b/charts/apisix/README.md @@ -120,17 +120,6 @@ The command removes all the Kubernetes components associated with the chart and | dashboard.config.conf.etcd.prefix | string | `"/apisix"` | apisix configurations prefix | | dashboard.config.conf.etcd.username | string | `nil` | Specifies etcd basic auth username if enable etcd auth | | dashboard.enabled | bool | `false` | | -| deployment.certs | object | `{"cert":"","cert_key":"","certsSecret":"","mTLSCACert":"","mTLSCACertSecret":""}` | certs used for certificates in decoupled mode | -| deployment.certs.cert | string | `""` | cert name in certsSecret | -| deployment.certs.cert_key | string | `""` | cert key in certsSecret | -| deployment.certs.certsSecret | string | `""` | secret name used for decoupled mode | -| deployment.certs.mTLSCACert | string | `""` | mTLS CA cert filename in mTLSCACertSecret | -| deployment.certs.mTLSCACertSecret | string | `""` | trusted_ca_cert name in certsSecret | -| deployment.controlPlane | object | `{"cert":"","certKey":"","certsSecret":"","confServerPort":"9280"}` | used for control_plane deployment mode | -| deployment.controlPlane.cert | string | `""` | conf Server CA cert name in certsSecret | -| deployment.controlPlane.certKey | string | `""` | conf Server cert key name in certsSecret | -| deployment.controlPlane.certsSecret | string | `""` | secret name used by conf Server | -| deployment.controlPlane.confServerPort | string | `"9280"` | conf Server address | | deployment.dataPlane | object | `{"controlPlane":{"host":[],"prefix":"/apisix","timeout":30}}` | used for data_plane deployment mode | | deployment.dataPlane.controlPlane.host | list | `[]` | The hosts of the control_plane used by the data_plane | | deployment.dataPlane.controlPlane.prefix | string | `"/apisix"` | The prefix of the control_plane used by the data_plane | diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml index 87f10647..cd94a3a9 100644 --- a/charts/apisix/templates/configmap.yaml +++ b/charts/apisix/templates/configmap.yaml @@ -306,13 +306,6 @@ data: {{- if eq .Values.deployment.role "control_plane" }} role_control_plane: config_provider: etcd - conf_server: - listen: 0.0.0.0:{{ .Values.deployment.controlPlane.confServerPort }} - cert: "/conf-server-ssl/{{ .Values.deployment.controlPlane.cert }}" - cert_key: "/conf-server-ssl/{{ .Values.deployment.controlPlane.certKey }}" - {{- if .Values.deployment.certs.mTLSCACertSecret }} - client_ca_cert: "/conf-ca-ssl/{{ .Values.deployment.certs.mTLSCACert }}" - {{- end }} {{- end }} admin: @@ -386,14 +379,7 @@ data: {{- if eq .Values.deployment.role "data_plane" }} role_data_plane: - config_provider: control_plane - control_plane: - host: - {{- range $.Values.deployment.dataPlane.controlPlane.host }} - - {{ . | quote }} - {{- end }} - prefix: {{ .Values.deployment.dataPlane.controlPlane.prefix }} - timeout: {{ .Values.deployment.dataPlane.controlPlane.timeout }} + config_provider: etcd {{- end }} {{- if eq .Values.deployment.mode "decoupled"}} diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index 73b07222..784bbc12 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -218,17 +218,6 @@ deployment: # ref: https://apisix.apache.org/docs/apisix/deployment-modes/ role: "traditional" - # -- used for control_plane deployment mode - controlPlane: - # -- conf Server address - confServerPort: "9280" - # -- secret name used by conf Server - certsSecret: "" - # -- conf Server CA cert name in certsSecret - cert: "" - # -- conf Server cert key name in certsSecret - certKey: "" - # -- used for data_plane deployment mode dataPlane: controlPlane: @@ -239,20 +228,6 @@ deployment: # -- Timeout when the data plane connects to the control plane timeout: 30 - # -- certs used for certificates in decoupled mode - certs: - # -- secret name used for decoupled mode - certsSecret: "" - # -- cert name in certsSecret - cert: "" - # -- cert key in certsSecret - cert_key: "" - - # -- trusted_ca_cert name in certsSecret - mTLSCACertSecret: "" - # -- mTLS CA cert filename in mTLSCACertSecret - mTLSCACert: "" - gateway: # -- Apache APISIX service type for user access itself type: NodePort