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

AlinsRan 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 f7e2b41  fix(ingress-controller): derive probe ports from 
config.probeAddr (#1022)
f7e2b41 is described below

commit f7e2b41eb20f33e65df7be2637ed7db75619223d
Author: AlinsRan <[email protected]>
AuthorDate: Thu Oct 15 08:51:29 2026 +0800

    fix(ingress-controller): derive probe ports from config.probeAddr (#1022)
---
 charts/apisix-ingress-controller/templates/_helpers.tpl    | 13 +++++++++++++
 charts/apisix-ingress-controller/templates/deployment.yaml |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/charts/apisix-ingress-controller/templates/_helpers.tpl 
b/charts/apisix-ingress-controller/templates/_helpers.tpl
index 08667a7..6bbb584 100644
--- a/charts/apisix-ingress-controller/templates/_helpers.tpl
+++ b/charts/apisix-ingress-controller/templates/_helpers.tpl
@@ -91,3 +91,16 @@ Webhook secret name - use value from values.yaml if 
provided, otherwise generate
 {{- printf "%s%s" $baseName $suffix -}}
 {{- end -}}
 {{- end }}
+
+{{/*
+Port of the controller health probe server, taken from config.probeAddr
+(e.g. ":8081", "0.0.0.0:8081", "[::]:8081").
+*/}}
+{{- define "apisix-ingress-controller-manager.probePort" -}}
+{{- $addr := .Values.config.probeAddr | default ":8081" -}}
+{{- $port := $addr | splitList ":" | last | int -}}
+{{- if or (le $port 0) (gt $port 65535) -}}
+{{- fail (printf "config.probeAddr %q must end with a valid port, e.g. 
\":8081\"" $addr) -}}
+{{- end -}}
+{{- $port -}}
+{{- end -}}
diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml 
b/charts/apisix-ingress-controller/templates/deployment.yaml
index 2d03b39..a2be2cb 100644
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ b/charts/apisix-ingress-controller/templates/deployment.yaml
@@ -86,14 +86,14 @@ spec:
         livenessProbe:
           httpGet:
             path: /healthz
-            port: 8081
+            port: {{ include "apisix-ingress-controller-manager.probePort" . }}
           initialDelaySeconds: 15
           periodSeconds: 20
         name: manager
         readinessProbe:
           httpGet:
             path: /readyz
-            port: 8081
+            port: {{ include "apisix-ingress-controller-manager.probePort" . }}
           initialDelaySeconds: 5
           periodSeconds: 10
         resources:

Reply via email to