Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/apisix-ingress-controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/apisix-ingress-controller/crds/apisixic-crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
6 changes: 3 additions & 3 deletions charts/apisix-ingress-controller/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions charts/apisix-ingress-controller/templates/gatewayproxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down