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 value to configure control plane load balancer allow list #343

Merged
merged 5 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Add teleport.service: Secure SSH access via Teleport
- Add teleport.service: Secure SSH access via Teleport.
- Add `controlPlane.loadBalancerIngressAllowCidrBlocks` to configure control plane load balancer ingress rules.

## [0.45.0] - 2023-10-04

Expand Down
2 changes: 2 additions & 0 deletions helm/cluster-aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ Properties within the `.controlPlane` top-level object
| `controlPlane.etcdVolumeSizeGB` | **Etcd volume size (GB)**|**Type:** `integer`<br/>**Default:** `100`|
| `controlPlane.instanceType` | **EC2 instance type**|**Type:** `string`<br/>**Default:** `"r6i.xlarge"`|
| `controlPlane.kubeletVolumeSizeGB` | **Kubelet volume size (GB)**|**Type:** `integer`<br/>**Default:** `100`|
| `controlPlane.loadBalancerIngressAllowCidrBlocks` | **Load balancer allow list** - IPv4 address ranges that are allowed to connect to the control plane load balancer, in CIDR notation. When setting this field, remember to add the Management cluster Nat Gateway IPs provided by Giant Swarm so that the cluster can still be managed.|**Type:** `array`<br/>**Default:** `["0.0.0.0/0"]`|
AndiDog marked this conversation as resolved.
Show resolved Hide resolved
| `controlPlane.loadBalancerIngressAllowCidrBlocks[*]` | **Address range**|**Type:** `string`<br/>|
| `controlPlane.machineHealthCheck` | **Machine health check**|**Type:** `object`<br/>|
| `controlPlane.machineHealthCheck.enabled` | **Enable**|**Type:** `boolean`<br/>**Default:** `true`|
| `controlPlane.machineHealthCheck.maxUnhealthy` | **Maximum unhealthy nodes**|**Type:** `string`<br/>**Example:** `"40%"`<br/>**Default:** `"40%"`|
Expand Down
9 changes: 9 additions & 0 deletions helm/cluster-aws/templates/_aws_cluster.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ spec:
{{- end }}
controlPlaneLoadBalancer:
scheme: {{ if (eq .Values.controlPlane.apiMode "public") }}internet-facing{{ else }}internal{{ end }}
{{- if .Values.controlPlane.loadBalancerIngressAllowCidrBlocks }}
ingressRules:
- description: "Kubernetes API"
protocol: tcp
fromPort: 6443
toPort: 6443
cidrBlocks:
{{- toYaml .Values.controlPlane.loadBalancerIngressAllowCidrBlocks | nindent 6 }}
{{- end }}
network:
cni:
cniIngressRules:
Expand Down
12 changes: 12 additions & 0 deletions helm/cluster-aws/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,18 @@
"title": "Kubelet volume size (GB)",
"default": 100
},
"loadBalancerIngressAllowCidrBlocks": {
calvix marked this conversation as resolved.
Show resolved Hide resolved
"type": "array",
"title": "Load balancer allow list",
"description": "IPv4 address ranges that are allowed to connect to the control plane load balancer, in CIDR notation. When setting this field, remember to add the Management cluster Nat Gateway IPs provided by Giant Swarm so that the cluster can still be managed.",
"items": {
"type": "string",
"title": "Address range"
},
"default": [
fiunchinho marked this conversation as resolved.
Show resolved Hide resolved
"0.0.0.0/0"
]
},
"machineHealthCheck": {
"type": "object",
"title": "Machine health check",
Expand Down
2 changes: 2 additions & 0 deletions helm/cluster-aws/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ controlPlane:
etcdVolumeSizeGB: 100
instanceType: r6i.xlarge
kubeletVolumeSizeGB: 100
loadBalancerIngressAllowCidrBlocks:
- 0.0.0.0/0
machineHealthCheck:
enabled: true
maxUnhealthy: 40%
Expand Down
Loading