gitadmin/gitops-ack-kro-argocd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: make AZ suffixes configurable for regions with non-standard AZs

Browse Source
This commit is contained in:
joaogac
2026-04-22 12:19:38 -03:00
parent 92b1041342
commit 10b3c1907e
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/kro/resource-groups/eks/rg-eks.yaml
+4
View File
@@ -22,6 +22,8 @@ spec:
domainName: string | default="cluster.example.com" domainName: string | default="cluster.example.com"
vpc: vpc:
create: boolean | default=true create: boolean | default=true
az1Suffix: string | default="a"
az2Suffix: string | default="b"
vpcCidr: string | default="10.0.0.0/16" vpcCidr: string | default="10.0.0.0/16"
publicSubnet1Cidr: string | default="10.0.1.0/24" publicSubnet1Cidr: string | default="10.0.1.0/24"
publicSubnet2Cidr: string | default="10.0.2.0/24" publicSubnet2Cidr: string | default="10.0.2.0/24"
@@ -69,6 +71,8 @@ spec:
spec: spec:
name: ${schema.spec.name} name: ${schema.spec.name}
region: ${schema.spec.region} region: ${schema.spec.region}
az1Suffix: ${schema.spec.vpc.az1Suffix}
az2Suffix: ${schema.spec.vpc.az2Suffix}
cidr: cidr:
vpcCidr: ${schema.spec.vpc.vpcCidr} vpcCidr: ${schema.spec.vpc.vpcCidr}
publicSubnet1Cidr: ${schema.spec.vpc.publicSubnet1Cidr} publicSubnet1Cidr: ${schema.spec.vpc.publicSubnet1Cidr}
charts/kro/resource-groups/eks/rg-vpc.yaml
+6 -4
View File
@@ -12,6 +12,8 @@ spec:
spec: spec:
name: string name: string
region: string region: string
az1Suffix: string | default="a"
az2Suffix: string | default="b"
cidr: cidr:
vpcCidr: string | default="10.0.0.0/16" vpcCidr: string | default="10.0.0.0/16"
publicSubnet1Cidr: string | default="10.0.1.0/24" publicSubnet1Cidr: string | default="10.0.1.0/24"
@@ -173,7 +175,7 @@ spec:
annotations: annotations:
services.k8s.aws/region: ${schema.spec.region} services.k8s.aws/region: ${schema.spec.region}
spec: spec:
availabilityZone: ${schema.spec.region}a availabilityZone: ${schema.spec.region}${schema.spec.az1Suffix}
cidrBlock: ${schema.spec.cidr.publicSubnet1Cidr} cidrBlock: ${schema.spec.cidr.publicSubnet1Cidr}
mapPublicIPOnLaunch: true mapPublicIPOnLaunch: true
vpcID: ${vpc.status.vpcID} vpcID: ${vpc.status.vpcID}
@@ -194,7 +196,7 @@ spec:
annotations: annotations:
services.k8s.aws/region: ${schema.spec.region} services.k8s.aws/region: ${schema.spec.region}
spec: spec:
availabilityZone: ${schema.spec.region}b availabilityZone: ${schema.spec.region}${schema.spec.az2Suffix}
cidrBlock: ${schema.spec.cidr.publicSubnet2Cidr} cidrBlock: ${schema.spec.cidr.publicSubnet2Cidr}
mapPublicIPOnLaunch: true mapPublicIPOnLaunch: true
vpcID: ${vpc.status.vpcID} vpcID: ${vpc.status.vpcID}
@@ -215,7 +217,7 @@ spec:
annotations: annotations:
services.k8s.aws/region: ${schema.spec.region} services.k8s.aws/region: ${schema.spec.region}
spec: spec:
availabilityZone: ${schema.spec.region}a availabilityZone: ${schema.spec.region}${schema.spec.az1Suffix}
cidrBlock: ${schema.spec.cidr.privateSubnet1Cidr} cidrBlock: ${schema.spec.cidr.privateSubnet1Cidr}
vpcID: ${vpc.status.vpcID} vpcID: ${vpc.status.vpcID}
routeTables: routeTables:
@@ -235,7 +237,7 @@ spec:
annotations: annotations:
services.k8s.aws/region: ${schema.spec.region} services.k8s.aws/region: ${schema.spec.region}
spec: spec:
availabilityZone: ${schema.spec.region}b availabilityZone: ${schema.spec.region}${schema.spec.az2Suffix}
cidrBlock: ${schema.spec.cidr.privateSubnet2Cidr} cidrBlock: ${schema.spec.cidr.privateSubnet2Cidr}
vpcID: ${vpc.status.vpcID} vpcID: ${vpc.status.vpcID}
routeTables: routeTables:
fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml
+2
View File
@@ -20,6 +20,8 @@ clusters:
k8sVersion: "1.34" k8sVersion: "1.34"
vpc: vpc:
create: true create: true
az1Suffix: "a"
az2Suffix: "c"
vpcCidr: "10.1.0.0/16" vpcCidr: "10.1.0.0/16"
publicSubnet1Cidr: "10.1.1.0/24" publicSubnet1Cidr: "10.1.1.0/24"
publicSubnet2Cidr: "10.1.2.0/24" publicSubnet2Cidr: "10.1.2.0/24"