Skip to content
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.

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

Add ports customisation options for ingress controller service. #479

Merged
merged 1 commit into from
Jan 16, 2019
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 deployments/helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: nginx-ingress
version: 0.3.1
version: 0.3.2
appVersion: edge
description: NGINX Ingress Controller
sources:
Expand Down
6 changes: 6 additions & 0 deletions deployments/helm-chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ Parameter | Description | Default
`controller.service.loadBalancerIP` | The static IP address for the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | None
`controller.service.loadBalancerSourceRanges` | The IP ranges (CIDR) that are allowed to access the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | []
`controller.service.externalIPs` | The list of external IPs for the Ingress controller service. | []
`controller.service.httpPort.enable` | Enables the HTTP port for the Ingress controller service. | true
`controller.service.httpPort.port` | The HTTP port of the Ingress controller service. | 80
`controller.service.httpPort.nodePort` | The custom NodePort for the HTTP port. Requires `controller.service.type` set to `NodePort`. | ""
`controller.service.httpsPort.enable` | Enables the HTTPS port for the Ingress controller service. | true
`controller.service.httpsPort.port` | The HTTPS port of the Ingress controller service. | 443
`controller.service.httpsPort.nodePort` | The custom NodePort for the HTTPS port. Requires `controller.service.type` set to `NodePort`. | ""
`controller.serviceAccount.name` | The name of the service account of the Ingress controller pods. Used for RBAC. | nginx-ingress
`controller.serviceAccount.imagePullSecrets` | The names of the secrets containing docker registry credentials. | []
`controller.ingressClass` | A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its class - i.e. have the annotation `"kubernetes.io/ingress.class"` equal to the class. Additionally, the Ingress controller processes Ingress resources that do not have that annotation which can be disabled by setting the "-use-ingress-class-only" flag. | nginx
Expand Down
14 changes: 12 additions & 2 deletions deployments/helm-chart/templates/controller-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,24 @@ spec:
{{- end }}
type: {{ .Values.controller.service.type }}
ports:
- port: 80
{{- if .Values.controller.service.httpPort.enable }}
- port: {{ .Values.controller.service.httpPort.port }}
targetPort: 80
protocol: TCP
name: http
- port: 443
{{- if eq .Values.controller.service.type "NodePort" }}
nodePort: {{ .Values.controller.service.httpPort.nodePort }}
{{- end }}
{{- end }}
{{- if .Values.controller.service.httpsPort.enable }}
- port: {{ .Values.controller.service.httpsPort.port }}
targetPort: 443
protocol: TCP
name: https
{{- if eq .Values.controller.service.type "NodePort" }}
nodePort: {{ .Values.controller.service.httpsPort.nodePort }}
{{- end }}
alejandro-llanes marked this conversation as resolved.
Show resolved Hide resolved
{{- end }}
selector:
app: {{ .Values.controller.name | trunc 63 }}
{{- if .Values.controller.service.externalIPs }}
Expand Down
8 changes: 8 additions & 0 deletions deployments/helm-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ controller:
loadBalancerIP: ""
externalIPs: []
loadBalancerSourceRanges: []
httpPort:
enable: true
port: 80
nodePort: ""
httpsPort:
enable: true
port: 443
nodePort: ""
serviceAccount:
name: nginx-ingress
imagePullSecrets: []
Expand Down