fix: default listenerPortMatchMode to off in apisix and ingress-controller charts

charts/apisix-ingress-controller/Chart.yaml

@@ -24,7 +24,7 @@ keywords:
   - nginx
   - crd
 type: application
-version: 1.2.0
+version: 1.2.1
 appVersion: 2.1.0
 sources:
   - https://github.com/apache/apisix-helm-chart

charts/apisix-ingress-controller/README.md

@@ -121,7 +121,7 @@ The same for container level, you need to set:
 | config.leaderElection.leaseDuration | string | `"15s"` |  |
 | config.leaderElection.renewDeadline | string | `"10s"` |  |
 | config.leaderElection.retryPeriod | string | `"2s"` |  |
-| config.listenerPortMatchMode | string | `"auto"` |  |
+| config.listenerPortMatchMode | string | `"off"` |  |
 | config.logLevel | string | `"info"` |  |
 | config.metricsAddr | string | `":8080"` |  |
 | config.probeAddr | string | `":8081"` |  |

charts/apisix-ingress-controller/templates/configmap.yaml

@@ -35,7 +35,7 @@ data:
     secure_metrics: {{ .Values.config.secureMetrics | default false }}
     exec_adc_timeout: {{ .Values.config.execADCTimeout | default "15s" }}
     disable_gateway_api: {{ .Values.config.disableGatewayAPI | default false }}
-    listener_port_match_mode: {{ .Values.config.listenerPortMatchMode | default "auto" }}
+    listener_port_match_mode: {{ .Values.config.listenerPortMatchMode | default "off" }}
     provider:
       type: {{ .Values.config.provider.type | default "apisix" }}
       sync_period: {{ .Values.config.provider.syncPeriod | default "1s" }}

charts/apisix-ingress-controller/values.yaml

@@ -92,7 +92,11 @@ config:
   secureMetrics: false
   execADCTimeout: "15s"
   disableGatewayAPI: false
-  listenerPortMatchMode: "auto"
+  # server_port matches the port APISIX actually listens on (e.g. 9080/9443),
+  # not the Gateway listener port. Defaults to "off" so port-var injection is
+  # opt-in; set to "auto"/"explicit" only when APISIX listens on the same ports
+  # declared in the Gateway listeners.
+  listenerPortMatchMode: "off"
   provider:
     type: "apisix"
     syncPeriod: "1m"

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: 2.14.1
+version: 2.14.2
 
 # 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

charts/apisix/values.yaml

@@ -688,6 +688,11 @@ etcd:
 # -- Ingress controller configuration
 ingress-controller:
   enabled: false
+  config:
+    # server_port matches the port APISIX actually listens on (e.g. 9080/9443),
+    # not the Gateway listener port. Default to "off" so port-var injection is
+    # opt-in.
+    listenerPortMatchMode: "off"
   webhook:
     # Specifies whether to enable the validation webhook.
     # Note: This feature relies on the '/apisix/admin/configs/validate' endpoint.