Skip to content

Commit

Permalink
Chart: Add missing constraints and tests. (#863)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gacko authored Sep 24, 2024
1 parent 00eed14 commit d187da1
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 2 deletions.
2 changes: 1 addition & 1 deletion helm/cluster-aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ Properties within the `.global.connectivity` object
| `global.connectivity.network.pods` | **Pods**|**Type:** `object`<br/>|
| `global.connectivity.network.pods.cidrBlocks` | **Pod subnets** - CIDR blocks used for pods. Right now, only one block is supported.<br/><br/>**Note if you use `global.connectivity.cilium.ipamMode=eni` (https://docs.cilium.io/en/latest/network/concepts/ipam/eni/#ipam-eni):** this will be associated as secondary VPC CIDR. Therefore, only sizes /16 to /28 sizes are possible (see https://docs.aws.amazon.com/vpc/latest/userguide/vpc-cidr-blocks.html). And `global.connectivity.eniModePodSubnets` must be a valid split of the CIDR you chose here – we recommend setting `10.1.0.0/16` here for ENI mode because the default values for `global.connectivity.eniModePodSubnets` match that CIDR.|**Type:** `array`<br/>**Default:** `["100.64.0.0/12"]`|
| `global.connectivity.network.pods.cidrBlocks[*]` | **Pod subnet** - IPv4 address range for pods, in CIDR notation.|**Type:** `string`<br/>**Example:** `"10.244.0.0/16"`<br/>|
| `global.connectivity.network.pods.nodeCidrMaskSize` | **Node CIDR mask size** - The size of the mask that is used for the node CIDR. The node CIDR is a sub-range of the pod CIDR and so the mask size and pod CIDR must be chosen such that there is enough space for the maximum number of nodes in the cluster.|**Type:** `integer`<br/>|
| `global.connectivity.network.pods.nodeCidrMaskSize` | **Node CIDR mask size** - The size of the mask that is used for the node CIDR. The node CIDR is a sub-range of the pod CIDR and so the mask size and pod CIDR must be chosen such that there is enough space for the maximum number of nodes in the cluster.|**Type:** `integer`<br/>**Default:** `24`|
| `global.connectivity.network.services` | **Services**|**Type:** `object`<br/>|
| `global.connectivity.network.services.cidrBlocks` | **K8s Service subnets**|**Type:** `array`<br/>**Default:** `["172.31.0.0/16"]`|
| `global.connectivity.network.services.cidrBlocks[*]` | **Service subnet** - IPv4 address range for kubernetes services, in CIDR notation.|**Type:** `string`<br/>**Example:** `"172.31.0.0/16"`<br/>|
Expand Down
21 changes: 21 additions & 0 deletions helm/cluster-aws/ci/test-auditd-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
global:
release:
version: v27.0.0-alpha.1
metadata:
name: test-wc-minimal
organization: test
servicePriority: lowest
components:
auditd:
enabled: true
connectivity:
baseDomain: example.com
providerSpecific:
region: "eu-west-1"
managementCluster: test

cluster:
internal:
ephemeralConfiguration:
offlineTesting:
renderWithoutReleaseResource: true
5 changes: 4 additions & 1 deletion helm/cluster-aws/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,10 @@
"nodeCidrMaskSize": {
"type": "integer",
"title": "Node CIDR mask size",
"description": "The size of the mask that is used for the node CIDR. The node CIDR is a sub-range of the pod CIDR and so the mask size and pod CIDR must be chosen such that there is enough space for the maximum number of nodes in the cluster."
"description": "The size of the mask that is used for the node CIDR. The node CIDR is a sub-range of the pod CIDR and so the mask size and pod CIDR must be chosen such that there is enough space for the maximum number of nodes in the cluster.",
"default": 24,
"maximum": 27,
"minimum": 16
}
}
},
Expand Down
1 change: 1 addition & 0 deletions helm/cluster-aws/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ global:
pods:
cidrBlocks:
- 100.64.0.0/12
nodeCidrMaskSize: 24
services:
cidrBlocks:
- 172.31.0.0/16
Expand Down

0 comments on commit d187da1

Please sign in to comment.