From c399a9d477f2c4ae6c36a783eb378f8f75f0c7f6 Mon Sep 17 00:00:00 2001
From: Alfredo Palhares <alfredo@palhares.me>
Date: Wed, 9 Oct 2024 18:26:38 +0100
Subject: [PATCH 1/3] Fix Apisix Control Service Port definition

---
 charts/apisix/templates/ingress-control.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/apisix/templates/ingress-control.yaml b/charts/apisix/templates/ingress-control.yaml
index a53c7f6c..0c26004f 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}}

From f49735a19c87a6d2fdd313d5cb33ebbe4dac89bd Mon Sep 17 00:00:00 2001
From: Alfredo Palhares <alfredo@palhares.me>
Date: Wed, 9 Oct 2024 19:04:24 +0100
Subject: [PATCH 2/3] Add tests

---
 charts/apisix/tests/ingress-control_test.yaml | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 charts/apisix/tests/ingress-control_test.yaml

diff --git a/charts/apisix/tests/ingress-control_test.yaml b/charts/apisix/tests/ingress-control_test.yaml
new file mode 100644
index 00000000..894c683f
--- /dev/null
+++ b/charts/apisix/tests/ingress-control_test.yaml
@@ -0,0 +1,20 @@
+suite: Control Ingress Configuation
+templates:
+  - ingress-control.yaml
+tests:
+  - it: should be disabled by default
+    asserts:
+      - hasDocuments:
+          count: 0
+  - it: should provide a working Ingress when enabled
+    set:
+      control:
+        ingress:
+          enabled: true
+    asserts:
+      - containsDocument:
+          kind: Ingress
+          apiVersion: networking.k8s.io/v1
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.service.port.number
+          value: 9090

From 0c158e224eb2c864ee9d927b47352e0516341885 Mon Sep 17 00:00:00 2001
From: Alfredo Palhares <alfredo@palhares.me>
Date: Thu, 10 Oct 2024 13:59:55 +0100
Subject: [PATCH 3/3] Service Control Remove need to deprecated
 .Values.apisix.enabled

---
 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..68628b89 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: