diff --git a/charts/kro/resource-groups/eks/rg-eks.yaml b/charts/kro/resource-groups/eks/rg-eks.yaml index 64f9a0a..967656e 100644 --- a/charts/kro/resource-groups/eks/rg-eks.yaml +++ b/charts/kro/resource-groups/eks/rg-eks.yaml @@ -22,6 +22,8 @@ spec: domainName: string | default="cluster.example.com" vpc: create: boolean | default=true + az1Suffix: string | default="a" + az2Suffix: string | default="b" vpcCidr: string | default="10.0.0.0/16" publicSubnet1Cidr: string | default="10.0.1.0/24" publicSubnet2Cidr: string | default="10.0.2.0/24" @@ -69,6 +71,8 @@ spec: spec: name: ${schema.spec.name} region: ${schema.spec.region} + az1Suffix: ${schema.spec.vpc.az1Suffix} + az2Suffix: ${schema.spec.vpc.az2Suffix} cidr: vpcCidr: ${schema.spec.vpc.vpcCidr} publicSubnet1Cidr: ${schema.spec.vpc.publicSubnet1Cidr} diff --git a/charts/kro/resource-groups/eks/rg-vpc.yaml b/charts/kro/resource-groups/eks/rg-vpc.yaml index 910bc45..bc35039 100644 --- a/charts/kro/resource-groups/eks/rg-vpc.yaml +++ b/charts/kro/resource-groups/eks/rg-vpc.yaml @@ -12,6 +12,8 @@ spec: spec: name: string region: string + az1Suffix: string | default="a" + az2Suffix: string | default="b" cidr: vpcCidr: string | default="10.0.0.0/16" publicSubnet1Cidr: string | default="10.0.1.0/24" @@ -173,7 +175,7 @@ spec: annotations: services.k8s.aws/region: ${schema.spec.region} spec: - availabilityZone: ${schema.spec.region}a + availabilityZone: ${schema.spec.region}${schema.spec.az1Suffix} cidrBlock: ${schema.spec.cidr.publicSubnet1Cidr} mapPublicIPOnLaunch: true vpcID: ${vpc.status.vpcID} @@ -194,7 +196,7 @@ spec: annotations: services.k8s.aws/region: ${schema.spec.region} spec: - availabilityZone: ${schema.spec.region}b + availabilityZone: ${schema.spec.region}${schema.spec.az2Suffix} cidrBlock: ${schema.spec.cidr.publicSubnet2Cidr} mapPublicIPOnLaunch: true vpcID: ${vpc.status.vpcID} @@ -215,7 +217,7 @@ spec: annotations: services.k8s.aws/region: ${schema.spec.region} spec: - availabilityZone: ${schema.spec.region}a + availabilityZone: ${schema.spec.region}${schema.spec.az1Suffix} cidrBlock: ${schema.spec.cidr.privateSubnet1Cidr} vpcID: ${vpc.status.vpcID} routeTables: @@ -235,7 +237,7 @@ spec: annotations: services.k8s.aws/region: ${schema.spec.region} spec: - availabilityZone: ${schema.spec.region}b + availabilityZone: ${schema.spec.region}${schema.spec.az2Suffix} cidrBlock: ${schema.spec.cidr.privateSubnet2Cidr} vpcID: ${vpc.status.vpcID} routeTables: diff --git a/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml b/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml index 3c4c9d1..8c77a93 100644 --- a/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml +++ b/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml @@ -20,6 +20,8 @@ clusters: k8sVersion: "1.34" vpc: create: true + az1Suffix: "a" + az2Suffix: "c" vpcCidr: "10.1.0.0/16" publicSubnet1Cidr: "10.1.1.0/24" publicSubnet2Cidr: "10.1.2.0/24"