From be2aa698ca57d1033432c600b5c11a25fe5d35a3 Mon Sep 17 00:00:00 2001 From: kzmain Date: Sat, 22 Feb 2025 00:54:39 +0800 Subject: [PATCH 1/3] Update ingress-control.yaml Cited wrong service port value from values.yaml, updated to the correct one. --- charts/apisix/templates/ingress-control.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/apisix/templates/ingress-control.yaml b/charts/apisix/templates/ingress-control.yaml index a53c7f6c..5b431642 100644 --- a/charts/apisix/templates/ingress-control.yaml +++ b/charts/apisix/templates/ingress-control.yaml @@ -16,7 +16,7 @@ {{- if (and .Values.control.enabled .Values.control.ingress.enabled) -}} {{- $fullName := include "apisix.fullname" . -}} -{{- $svcPort := .Values.control.servicePort -}} +{{- $svcPort := .Values.control.service.servicePort -}} {{- if and .Values.control.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.control.ingress.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.control.ingress.annotations "kubernetes.io/ingress.class" .Values.control.ingress.className}} @@ -65,7 +65,7 @@ spec: service: name: {{ $fullName }}-control port: - number: {{ $svcPort }} + number: {{ $svcPort }} {{- else }} backend: serviceName: {{ $fullName }}-control From 9adb96ef40a69bafb802ef5f107aa58ca8442b5c Mon Sep 17 00:00:00 2001 From: kzmain Date: Sat, 22 Feb 2025 03:39:56 +0800 Subject: [PATCH 2/3] Update service-control.yaml `and .Values.apisix.enabled ` is not required to create the control service --- charts/apisix/templates/service-control.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/apisix/templates/service-control.yaml b/charts/apisix/templates/service-control.yaml index 0519aed8..679e9851 100644 --- a/charts/apisix/templates/service-control.yaml +++ b/charts/apisix/templates/service-control.yaml @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -{{ if (and .Values.apisix.enabled .Values.control.enabled) }} +{{ if (.Values.control.enabled) }} apiVersion: v1 kind: Service metadata: From 12b028bee64f89b030b62c2c18ef963c348a6e2a Mon Sep 17 00:00:00 2001 From: kzmain Date: Sat, 22 Feb 2025 03:41:48 +0800 Subject: [PATCH 3/3] Update values.yaml Update value.yaml to ensure control service's ingress work well. --- charts/apisix/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml index f552c7dc..3b785e96 100644 --- a/charts/apisix/values.yaml +++ b/charts/apisix/values.yaml @@ -235,7 +235,7 @@ control: # nodePort: 32000 # -- which ip to listen on for Apache APISIX Control API - ip: "127.0.0.1" + ip: 0.0.0.0 # -- which port to use for Apache APISIX Control API port: 9090 # -- Service port to use for Apache APISIX Control API @@ -253,7 +253,7 @@ control: hosts: - host: apisix-control.local paths: - - "/*" + - "/" tls: [] # - secretName: apisix-tls # hosts: