Skip to content

Make containerPort and hostPort customizable #4252

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
merged 3 commits into from
Aug 21, 2023
Merged

Make containerPort and hostPort customizable #4252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39bbf40
Make containerPort and hostPort customizable
lucacome Aug 17, 2023
5076a31
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 17, 2023
0f1cc58
Merge branch 'main' into feat/customize-ports
lucacome Aug 18, 2023
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
14 changes: 8 additions & 6 deletions deployments/helm-chart/templates/controller-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,14 @@ spec:
{{ toYaml .Values.controller.lifecycle | indent 10 }}
{{- end }}
ports:
- name: http
containerPort: 80
hostPort: 80
- name: https
containerPort: 443
hostPort: 443
{{- range $key, $value := .Values.controller.containerPort }}
- name: {{ $key }}
containerPort: {{ $value }}
protocol: TCP
{{- if and $.Values.controller.hostPort.enable (index $.Values.controller.hostPort $key) }}
hostPort: {{ index $.Values.controller.hostPort $key }}
{{- end }}
{{- end }}
{{ if .Values.controller.customPorts }}
{{ toYaml .Values.controller.customPorts | indent 8 }}
{{ end }}
Expand Down
12 changes: 8 additions & 4 deletions deployments/helm-chart/templates/controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,14 @@ spec:
{{ toYaml .Values.controller.lifecycle | indent 10 }}
{{- end }}
ports:
- name: http
containerPort: 80
- name: https
containerPort: 443
{{- range $key, $value := .Values.controller.containerPort }}
- name: {{ $key }}
containerPort: {{ $value }}
protocol: TCP
{{- if and $.Values.controller.hostPort.enable (index $.Values.controller.hostPort $key) }}
hostPort: {{ index $.Values.controller.hostPort $key }}
{{- end }}
{{- end }}
{{- if .Values.controller.customPorts }}
{{ toYaml .Values.controller.customPorts | indent 8 }}
{{- end }}
Expand Down
29 changes: 29 additions & 0 deletions deployments/helm-chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,35 @@
true
]
},
"hostPort": {
"type": "object",
"default": {},
"title": "The hostPort Schema",
"patternProperties": {
"^.*$": {
"anyOf": [
{
"$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.27.4/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort/properties/hostPort"
},
{
"type": "boolean"
}
]
}
},
"additionalProperties": false
},
"containerPort": {
"type": "object",
"default": {},
"title": "The containerPort Schema",
"patternProperties": {
"^.*$": {
"$ref": "https://raw.githubusercontent.com/nginxinc/kubernetes-json-schema/master/v1.27.4/_definitions.json#/definitions/io.k8s.api.core.v1.ContainerPort/properties/containerPort"
}
},
"additionalProperties": false
},
"dnsPolicy": {
"type": "string",
"allOf": [
Expand Down
18 changes: 18 additions & 0 deletions deployments/helm-chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,24 @@ controller:
## Enables the Ingress Controller pods to use the host's network namespace.
hostNetwork: false

## The hostPort configuration for the Ingress Controller pods.
hostPort:
## Enables hostPort for the Ingress Controller pods.
enable: false

## The HTTP hostPort configuration for the Ingress Controller pods.
http: 80

## The HTTPS hostPort configuration for the Ingress Controller pods.
https: 443

containerPort:
## The HTTP containerPort configuration for the Ingress Controller pods.
http: 80

## The HTTPS containerPort configuration for the Ingress Controller pods.
https: 443

## DNS policy for the Ingress Controller pods
dnsPolicy: ClusterFirst

Expand Down