Skip to content

refactor: update CRD and deployment configurations #842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlinsRan merged 2 commits into from
Jul 3, 2025
Merged

refactor: update CRD and deployment configurations #842

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9acf4b2
refactor: update CRD and deployment configurations
dspo Jul 3, 2025
e745fed
bump apisix-ingress-controller version to 1.0.1
dspo Jul 3, 2025
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
3 changes: 2 additions & 1 deletion charts/apisix-ingress-controller/crds/apisixic-crds.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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