This is an automated email from the ASF dual-hosted git repository. kvn 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 233f12c remove invalid values (#38) 233f12c is described below commit 233f12c6a6ace9ff701fe7b544bd73178896e180 Author: Jun <junnp...@users.noreply.github.com> AuthorDate: Thu Mar 11 09:57:47 2021 +0800 remove invalid values (#38) --- charts/apisix/Chart.yaml | 2 +- charts/apisix/templates/configmap.yaml | 2 +- charts/apisix/templates/deployment.yaml | 2 +- charts/apisix/values.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml index 5d3c785..5c0ed23 100644 --- a/charts/apisix/Chart.yaml +++ b/charts/apisix/Chart.yaml @@ -31,7 +31,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/apisix/templates/configmap.yaml b/charts/apisix/templates/configmap.yaml index 31d0d3a..2b7820e 100644 --- a/charts/apisix/templates/configmap.yaml +++ b/charts/apisix/templates/configmap.yaml @@ -146,7 +146,7 @@ data: etcd: {{- if .Values.etcd.enabled }} host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster. - - "http://{{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.gateway.k8s_domain }}:{{ .Values.etcd.defaultPort }}" + - "http://{{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }}:{{ .Values.etcd.service.port }}" {{- else }} host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster. {{- range $value := .Values.etcd.host }} diff --git a/charts/apisix/templates/deployment.yaml b/charts/apisix/templates/deployment.yaml index e8df5ca..318cff2 100644 --- a/charts/apisix/templates/deployment.yaml +++ b/charts/apisix/templates/deployment.yaml @@ -87,7 +87,7 @@ spec: initContainers: - name: wait-etcd image: busybox:1.28 - command: ['sh', '-c', "until nc -z {{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.gateway.k8s_domain }} {{ .Values.etcd.defaultPort }}; do echo waiting for etcd `date`; sleep 2; done;"] + command: ['sh', '-c', "until nc -z {{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.{{ .Values.etcd.clusterDomain }} {{ .Values.etcd.service.port }}; do echo waiting for etcd `date`; sleep 2; done;"] {{- end }} volumes: - configMap: diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index 5cb53ed..d806a5b 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -42,7 +42,6 @@ securityContext: gateway: type: NodePort - k8s_domain: cluster.local # type: LoadBalancer # annotations: # service.beta.kubernetes.io/aws-load-balancer-type: nlb @@ -79,7 +78,8 @@ etcd: - http://etcd.host:2379 # host or ip e.g. http://172.20.128.89:2379 prefix: "/apisix" timeout: 30 - defaultPort: 2379 + + # if etcd.enabled is true, set more values of bitnami/etcd helm chart auth: rbac: # No authentication by default