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.

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

Backport of Consul API Gateway, Add Tolerations support into release/0.49.x #1667

Merged
merged 1 commit into from
Nov 4, 2022
Merged

Backport of Consul API Gateway, Add Tolerations support into release/0.49.x #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ IMPROVEMENTS:
* Helm:
* Add `tolerations` and `nodeSelector` to Server ACL init jobs and `nodeSelector` to Webhook cert manager. [[GH-1581](https://github.com/hashicorp/consul-k8s/pull/1581)]
* API Gateway: Allow controller to read MeshServices for use as a route backend. [[GH-1574](https://github.com/hashicorp/consul-k8s/pull/1574)]
* API Gateway: Add `tolerations` to `apiGateway.managedGatewayClass` and `apiGateway.controller` [[GH-1650](https://github.com/hashicorp/consul-k8s/pull/1650)]
* API Gateway: Create PodSecurityPolicy for controller when `global.enablePodSecurityPolicies=true`. [[GH-1656](https://github.com/hashicorp/consul-k8s/pull/1656)]

## 0.49.0 (September 30, 2022)
Expand Down
4 changes: 4 additions & 0 deletions charts/consul/templates/api-gateway-controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,8 @@ spec:
nodeSelector:
{{ tpl .Values.apiGateway.controller.nodeSelector . | indent 8 | trim }}
{{- end }}
{{- if .Values.apiGateway.controller.tolerations }}
tolerations:
{{ tpl .Values.apiGateway.controller.tolerations . | indent 8 | trim }}
{{- end }}
{{- end }}
6 changes: 5 additions & 1 deletion charts/consul/templates/api-gateway-gatewayclassconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ spec:
image:
consulAPIGateway: {{ .Values.apiGateway.image }}
envoy: {{ .Values.global.imageEnvoy }}
{{- if .Values.apiGateway.nodeSelector }}
{{- if .Values.apiGateway.managedGatewayClass.nodeSelector }}
nodeSelector:
{{ tpl .Values.apiGateway.managedGatewayClass.nodeSelector . | indent 4 | trim }}
{{- end }}
{{- if .Values.apiGateway.managedGatewayClass.tolerations }}
tolerations:
{{ tpl .Values.apiGateway.managedGatewayClass.tolerations . | indent 4 | trim }}
{{- end }}
{{- if .Values.apiGateway.managedGatewayClass.copyAnnotations.service }}
copyAnnotations:
service:
Expand Down
13 changes: 13 additions & 0 deletions charts/consul/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2956,6 +2956,13 @@ apiGateway:
# @type: string
nodeSelector: null

# This value defines the tolerations that will be assigned to a gateway pod.
# This should be a multi-line string matching the
# Tolerations (https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) array in a Pod spec.
#
# @type: string
tolerations: null

# This value defines the type of service created for gateways (e.g. LoadBalancer, ClusterIP)
serviceType: LoadBalancer

Expand Down Expand Up @@ -3038,6 +3045,12 @@ apiGateway:
# @type: string
nodeSelector: null

# This value defines the tolerations for api-gateway-controller pod, this should be a multi-line string matching the
# Tolerations (https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) array in a Pod spec.
#
# @type: string
tolerations: null

# Configuration for the Service created for the api-gateway-controller
service:
# Annotations to apply to the api-gateway-controller service.
Expand Down