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}} 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: