You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/11/03 10:27:52 UTC

[apisix-helm-chart] 01/01: feat: support more APISIX features

This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch feat/better-support
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git

commit 666e6044af3262bdcd39e7c1932a783d85ae035c
Author: Chao Zhang <to...@apache.org>
AuthorDate: Wed Nov 3 18:27:26 2021 +0800

    feat: support more APISIX features
    
    Signed-off-by: Chao Zhang <to...@apache.org>
---
 charts/apisix/templates/configmap.yaml | 10 +++++++++-
 charts/apisix/values.yaml              |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml
index d470b35..9cbb634 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -206,6 +206,7 @@ data:
         cert: "/etcd-ssl/{{ .Values.etcd.auth.tls.certFilename }}"
         key: "/etcd-ssl/{{ .Values.etcd.auth.tls.certKeyFilename }}"
         verify: {{ .Values.etcd.auth.tls.verify }}
+        sni: "{{ .Values.etcd.auth.tls.sni }}"
       {{- end }}
 
     {{- if .Values.plugins }}
@@ -224,10 +225,17 @@ data:
       - {{ $plugin }}
     {{- end }}
 
-    {{- if .Values.customPlugins.enabled }}
+    {{- if or .Values.pluginAttrs .Values.customPlugins.enabled }}
     plugin_attr:
+    {{- if .Values.customPlugins.enabled }}
     {{- range $plugin := .Values.customPlugins.plugins }}
       {{ $plugin.name }}: {{- $plugin.attrs | toYaml | nindent 8 }}
     {{- end }}
     {{- end }}
+    {{- if .Values.pluginAttrs }}
+    {{- range $name, $attrs := .Values.pluginAttrs }}
+      {{ $name}}: {{- $attrs | toYaml | nindent 8 }}
+    {{- end }}
+    {{- end }}
+    {{- end }}
 {{- end }}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 51c6252..eb8d660 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -186,6 +186,8 @@ stream_plugins:
   - ip-restriction
   - limit-conn
 
+pluginAttrs: null
+
 # customPlugins allows you to mount your own HTTP plugins.
 customPlugins:
   enabled: false
@@ -265,6 +267,7 @@ etcd:
       certFilename: ""
       certKeyFilename: ""
       verify: true
+      sni: ""
 
   service:
     port: 2379