This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git
The following commit(s) were added to refs/heads/master by this push:
new 78cb59f feat: support vault configuration (#340)
78cb59f is described below
commit 78cb59f1fe6c8ce16681e593faefc80aad1d1879
Author: Issam Hakimi <[email protected]>
AuthorDate: Tue Sep 20 05:34:37 2022 -0400
feat: support vault configuration (#340)
---
charts/apisix/README.md | 11 +++++++++++
charts/apisix/templates/configmap.yaml | 8 ++++++++
charts/apisix/values.yaml | 7 +++++++
3 files changed, 26 insertions(+)
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 343f10d..8a1d91c 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -228,3 +228,14 @@ Configurations for Apache APISIX ingress-controller sub
chart.
|--------------------------------|----------------------|-----------|
| `initContainer.image` | Init container image | `busybox` |
| `initContainer.tag` | Init container tag | `1.28` |
+
+### vault integration parameters
+
+| Parameter | Description
| Default
|
+|----------------------------|--------------------------------------------------------------------------------------------------|---------------------------------------------------------|
+| `vault.enabled` | Enable or disable the vault integration
| `false`
|
+| `vault.host` | The host address where the vault server is
running. |
|
+| `vault.timeout` | HTTP timeout for each request.
|
|
+| `vault.token` | The generated token from vault instance that
can grant access to read data from the vault. |
|
+| `vault.prefix` | Prefix allows you to better enforcement of
policies. |
|
+
diff --git a/charts/apisix/templates/configmap.yaml
b/charts/apisix/templates/configmap.yaml
index 50ba24c..c48d908 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -253,6 +253,14 @@ data:
{{- end }}
{{- end }}
+ {{- if .Values.vault.enabled }}
+ vault:
+ host: {{ .Values.vault.host }}
+ timeout: {{ .Values.vault.timeout }}
+ token: {{ .Values.vault.token }}
+ prefix: {{ .Values.vault.prefix }}
+ {{- end }}
+
{{- if .Values.plugins }}
plugins: # plugin list
{{- range $plugin := .Values.plugins }}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 81043e8..ea89965 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -439,3 +439,10 @@ dashboard:
ingress-controller:
enabled: false
+
+vault:
+ enabled: false
+ host: ""
+ timeout: 10
+ token: ""
+ prefix: ""
