diff --git a/deployments/helm-chart/Chart.yaml b/deployments/helm-chart/Chart.yaml index 1da2d0d6a4..b10c022a9f 100644 --- a/deployments/helm-chart/Chart.yaml +++ b/deployments/helm-chart/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.3.1 +version: 0.3.2 appVersion: edge description: NGINX Ingress Controller sources: diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md index c2d4c87c51..4fe08f3316 100644 --- a/deployments/helm-chart/README.md +++ b/deployments/helm-chart/README.md @@ -81,6 +81,8 @@ 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.NodePort.Http` | Custom NodePort number for http. Requires `controller.service.type` set to `NodePort`. | None +`controller.service.NodePort.Https` | Custom NodePort number for https. Requires `controller.service.type` set to `NodePort`. | None `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 diff --git a/deployments/helm-chart/templates/controller-service.yaml b/deployments/helm-chart/templates/controller-service.yaml index a766b0308c..764e7eeb12 100644 --- a/deployments/helm-chart/templates/controller-service.yaml +++ b/deployments/helm-chart/templates/controller-service.yaml @@ -33,10 +33,20 @@ spec: targetPort: 80 protocol: TCP name: http + {{- if (eq .Values.controller.service.type "NodePort") }} + {{- if .Values.controller.service.NodePort.Http }} + nodePort: {{ .Values.controller.service.NodePort.Http }} + {{- end}} + {{- end}} - port: 443 targetPort: 443 protocol: TCP name: https + {{- if (eq .Values.controller.service.type "NodePort") }} + {{- if .Values.controller.service.NodePort.Https }} + nodePort: {{ .Values.controller.service.NodePort.Https }} + {{- end}} + {{- end}} selector: app: {{ .Values.controller.name | trunc 63 }} {{- if .Values.controller.service.externalIPs }} diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml index 036cbaf3a0..98e6cc236a 100644 --- a/deployments/helm-chart/values.yaml +++ b/deployments/helm-chart/values.yaml @@ -36,6 +36,9 @@ controller: loadBalancerIP: "" externalIPs: [] loadBalancerSourceRanges: [] + NodePort: + Http: 32080 + Https: 32443 serviceAccount: name: nginx-ingress imagePullSecrets: []