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 b7dd8dc feat: add updateStrategy settings for ingress and dashboard
(#583)
b7dd8dc is described below
commit b7dd8dc92d0fff7dfd5834a6abdfb8a412f17641
Author: ikatlinsky <[email protected]>
AuthorDate: Sun Jul 16 19:23:03 2023 +0200
feat: add updateStrategy settings for ingress and dashboard (#583)
Co-authored-by: Katlinsky, Ilya <[email protected]>
---
charts/apisix-dashboard/README.md | 1 +
charts/apisix-dashboard/templates/deployment.yaml | 3 +++
charts/apisix-dashboard/values.yaml | 4 ++++
charts/apisix-ingress-controller/README.md | 1 +
charts/apisix-ingress-controller/templates/deployment.yaml | 3 +++
charts/apisix-ingress-controller/values.yaml | 4 ++++
charts/apisix/README.md | 2 +-
charts/apisix/values.yaml | 1 +
8 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/charts/apisix-dashboard/README.md
b/charts/apisix-dashboard/README.md
index b45176a..a894231 100644
--- a/charts/apisix-dashboard/README.md
+++ b/charts/apisix-dashboard/README.md
@@ -96,3 +96,4 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/)
for command documen
| serviceAccount.create | bool | `true` | Specifies whether a service account
should be created |
| serviceAccount.name | string | `""` | The name of the service account to
use. If not set and create is true, a name is generated using the fullname
template |
| tolerations | list | `[]` | Tolerations for pod assignment |
+| updateStrategy | object | `{}` | Update strategy for apisix dashboard
deployment |
diff --git a/charts/apisix-dashboard/templates/deployment.yaml
b/charts/apisix-dashboard/templates/deployment.yaml
index 6514594..e83a065 100644
--- a/charts/apisix-dashboard/templates/deployment.yaml
+++ b/charts/apisix-dashboard/templates/deployment.yaml
@@ -28,6 +28,9 @@ spec:
selector:
matchLabels:
{{- include "apisix-dashboard.selectorLabels" . | nindent 6 }}
+ {{- with .Values.updateStrategy }}
+ strategy: {{ toYaml . | nindent 4 }}
+ {{- end }}
template:
metadata:
annotations:
diff --git a/charts/apisix-dashboard/values.yaml
b/charts/apisix-dashboard/values.yaml
index ffc543d..58a58c0 100644
--- a/charts/apisix-dashboard/values.yaml
+++ b/charts/apisix-dashboard/values.yaml
@@ -165,6 +165,10 @@ autoscaling:
targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80
+# -- Update strategy for apisix dashboard deployment
+updateStrategy: {}
+ # type: RollingUpdate
+
# -- Node labels for pod assignment
nodeSelector: {}
diff --git a/charts/apisix-ingress-controller/README.md
b/charts/apisix-ingress-controller/README.md
index e9736e5..ffd6190 100644
--- a/charts/apisix-ingress-controller/README.md
+++ b/charts/apisix-ingress-controller/README.md
@@ -164,3 +164,4 @@ The same for container level, you need to set:
| serviceMonitor.labels | object | `{}` | @param serviceMonitor.labels
ServiceMonitor extra labels |
| serviceMonitor.metricRelabelings | object | `{}` | @param
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples
before ingestion. ref:
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
|
| tolerations | list | `[]` | |
+| updateStrategy | object | `{}` | Update strategy for apisix ingress
controller deployment |
diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml
b/charts/apisix-ingress-controller/templates/deployment.yaml
index df0337d..34a0b49 100644
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ b/charts/apisix-ingress-controller/templates/deployment.yaml
@@ -28,6 +28,9 @@ spec:
selector:
matchLabels:
{{- include "apisix-ingress-controller.selectorLabels" . | nindent 6 }}
+ {{- with .Values.updateStrategy }}
+ strategy: {{ toYaml . | nindent 4 }}
+ {{- end }}
template:
metadata:
annotations:
diff --git a/charts/apisix-ingress-controller/values.yaml
b/charts/apisix-ingress-controller/values.yaml
index 266c828..2ffce72 100644
--- a/charts/apisix-ingress-controller/values.yaml
+++ b/charts/apisix-ingress-controller/values.yaml
@@ -160,6 +160,10 @@ autoscaling:
targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80
+# -- Update strategy for apisix ingress controller deployment
+updateStrategy: {}
+ # type: RollingUpdate
+
nodeSelector: {}
tolerations: []
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 58ae897..8771b08 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -225,7 +225,7 @@ The command removes all the Kubernetes components
associated with the chart and
| serviceMonitor.namespace | string | `""` | namespace where the
serviceMonitor is deployed, by default, it is the same as the namespace of the
apisix |
| serviceMonitor.path | string | `"/apisix/prometheus/metrics"` | path of the
metrics endpoint |
| stream_plugins | list | `[]` | Customize the list of APISIX stream_plugins
to enable. By default, APISIX's default stream_plugins are automatically used.
See
[config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml)
|
-| updateStrategy | object | `{}` | |
+| updateStrategy | object | `{}` | Update strategy for apisix deployment |
| vault.enabled | bool | `false` | Enable or disable the vault integration |
| vault.host | string | `""` | The host address where the vault server is
running. |
| vault.prefix | string | `""` | Prefix allows you to better enforcement of
policies. |
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 4603389..8c06456 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -439,6 +439,7 @@ customPlugins:
- key: "the-file-name"
path: "mount-path"
+# -- Update strategy for apisix deployment
updateStrategy: {}
# type: RollingUpdate
