diff --git a/charts/apisix-ingress-controller/Chart.yaml b/charts/apisix-ingress-controller/Chart.yaml index fed9df92..e116b42e 100644 --- a/charts/apisix-ingress-controller/Chart.yaml +++ b/charts/apisix-ingress-controller/Chart.yaml @@ -24,7 +24,7 @@ keywords: - nginx - crd type: application -version: 1.0.0 +version: 1.0.1 appVersion: 2.0.0-rc1 sources: - https://github.com/apache/apisix-helm-chart diff --git a/charts/apisix-ingress-controller/crds/apisixic-crds.yaml b/charts/apisix-ingress-controller/crds/apisixic-crds.yaml index cdbcdcb4..3ef155bb 100644 --- a/charts/apisix-ingress-controller/crds/apisixic-crds.yaml +++ b/charts/apisix-ingress-controller/crds/apisixic-crds.yaml @@ -2757,8 +2757,9 @@ spec: type: boolean required: - auth - - endpoints type: object + x-kubernetes-validations: + - rule: has(self.endpoints) != has(self.service) type: description: Type specifies the type of provider. Can only be `ControlPlane`. diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml b/charts/apisix-ingress-controller/templates/deployment.yaml index 5e905abe..b1a24e78 100644 --- a/charts/apisix-ingress-controller/templates/deployment.yaml +++ b/charts/apisix-ingress-controller/templates/deployment.yaml @@ -17,14 +17,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - labels: - {{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }} - name: {{ .Release.Name }} + name: {{ include "apisix-ingress-controller-manager.name.fullname" . }} namespace: {{ .Release.Namespace }} annotations: {{- range $key, $value := .Values.deployment.annotations }} {{ $key }}: {{ $value | quote }} {{- end }} + labels: + {{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }} spec: replicas: {{ .Values.deployment.replicas }} selector: diff --git a/charts/apisix-ingress-controller/templates/gatewayproxy.yaml b/charts/apisix-ingress-controller/templates/gatewayproxy.yaml index 01923cd5..8c767cbc 100644 --- a/charts/apisix-ingress-controller/templates/gatewayproxy.yaml +++ b/charts/apisix-ingress-controller/templates/gatewayproxy.yaml @@ -24,9 +24,9 @@ spec: provider: type: {{ .Values.gatewayProxy.provider.type }} controlPlane: - endpoints: - {{ $adminService := .Values.apisix.adminService -}} - - http://{{ $adminService.name }}.{{ $adminService.namespace }}:{{ $adminService.port }} + service: + name: {{ .Values.apisix.adminService.name }} + port: {{ .Values.apisix.adminService.port }} {{- with .Values.gatewayProxy.provider.controlPlane.auth }} auth: {{- toYaml . | nindent 8 }}