kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make Karpenter respect IG's spec.Subnets 

This will add tag all subnets with the IGs using that subnet

Update docs/operations/karpenter.md

Co-authored-by: Peter Rifel <rifelpet@users.noreply.github.com>
This commit is contained in:
Ole Markus With 2022-08-01 07:35:36 +02:00
parent 2a21b49eea
commit 8bcc640452
81 changed files with 554 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/operations/karpenter.md
View File

@ -45,16 +45,16 @@ A Karpenter-managed InstanceGroup controls a corresponding Karpenter Provisioner
Note that not all features of InstanceGroups are supported.
## Subnets
By default, kOps will tag subnets with `kops.k8s.io/instance-group/<intancegroup>: "true"` for each InstanceGroup the subnet is assigned to. If you enable manual tagging of subnets, you have to ensure these tags are added, if not Karpenter will fail to provision any instances.
## Instance Types
If you do not specify a mixed instances policy, only the instance type specified by `spec.machineType` will be used. With Karpenter, one typically wants a wider range of instances to choose from. kOps supports both providing a list of instance types through `spec.mixedInstancesPolicy.instances` and providing instance type requirements through `spec.mixedInstancesPolicy.instanceRequirements`. See (/instance_groups)[InstanceGroup documentation] for more details.
## Known limitations
### Subnet selections
kOps will ignore the InstanceGroup `spec.subnets` configuration and unconditionally add all subnets eligible to run Nodes to all Provisioners. It is not currently possible to create Provisioners limited only to certain subnets.
### Karpenter-managed Launch Templates
On EKS, Karpener creates its own launch templates for Provisioners. These launch templates will not work with a kOps cluster for a number of reasons. Most importantly, they do not use supported AMIs and they do not install and configure nodeup, the instance-side kOps component. The Karpenter features that require Karpenter to directly manage launch templates will not be available on kOps.

9
pkg/model/awsmodel/network.go
View File

@ -256,6 +256,15 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
default:
klog.V(2).Infof("unable to properly tag subnet %q because it has unknown type %q. Load balancers may be created in incorrect subnets", subnetSpec.Name, subnetSpec.Type)
}
for _, ig := range b.InstanceGroups {
for _, igSubnetName := range ig.Spec.Subnets {
if subnetSpec.Name == igSubnetName {
tags["kops.k8s.io/instance-group/"+ig.GetName()] = "true"
}
}
}
} else {
klog.V(2).Infof("skipping subnet tags. Ensure these are maintained externally.")
}

12
tests/integration/update_cluster/apiservernodes/cloudformation.json
View File

@ -992,6 +992,18 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/apiserver",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"

15
tests/integration/update_cluster/apiservernodes/kubernetes.tf
View File

@ -962,12 +962,15 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/apiserver" = "true"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/aws-lb-controller/kubernetes.tf
View File

@ -876,12 +876,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

3
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -1188,6 +1188,8 @@ resource "aws_subnet" "us-test-1a-bastionuserdata-example-com" {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "us-test-1a.bastionuserdata.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1201,6 +1203,7 @@ resource "aws_subnet" "utility-us-test-1a-bastionuserdata-example-com" {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "utility-us-test-1a.bastionuserdata.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

8
tests/integration/update_cluster/complex/cloudformation.json
View File

@ -1224,6 +1224,14 @@
"Key": "foo/bar",
"Value": "fib+baz"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/complex.example.com",
"Value": "owned"

18
tests/integration/update_cluster/complex/kubernetes.tf
View File

@ -1149,14 +1149,16 @@ resource "aws_subnet" "us-test-1a-complex-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "complex.example.com"
"Name" = "us-test-1a.complex.example.com"
"Owner" = "John Doe"
"SubnetType" = "Public"
"foo/bar" = "fib+baz"
"kubernetes.io/cluster/complex.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "complex.example.com"
"Name" = "us-test-1a.complex.example.com"
"Owner" = "John Doe"
"SubnetType" = "Public"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/complex.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.complex-example-com.id
}

14
tests/integration/update_cluster/compress/kubernetes.tf
View File

@ -757,12 +757,14 @@ resource "aws_subnet" "us-test-1a-compress-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "compress.example.com"
"Name" = "us-test-1a.compress.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/compress.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "compress.example.com"
"Name" = "us-test-1a.compress.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/compress.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.compress-example-com.id
}

8
tests/integration/update_cluster/containerd-custom/cloudformation.json
View File

@ -785,6 +785,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/containerd.example.com",
"Value": "owned"

8
tests/integration/update_cluster/containerd/cloudformation.json
View File

@ -785,6 +785,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/containerd.example.com",
"Value": "owned"

14
tests/integration/update_cluster/digit/kubernetes.tf
View File

@ -859,12 +859,14 @@ resource "aws_subnet" "us-test-1a-123-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "123.example.com"
"Name" = "us-test-1a.123.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/123.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "123.example.com"
"Name" = "us-test-1a.123.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/123.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.prefix_123-example-com.id
}

8
tests/integration/update_cluster/docker-custom/cloudformation.json
View File

@ -785,6 +785,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/docker.example.com",
"Value": "owned"

4
tests/integration/update_cluster/existing_iam/kubernetes.tf
View File

@ -1102,6 +1102,8 @@ resource "aws_subnet" "us-test-1a-existing-iam-example-com" {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "us-test-1a.existing-iam.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1116,6 +1118,7 @@ resource "aws_subnet" "us-test-1b-existing-iam-example-com" {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "us-test-1b.existing-iam.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1130,6 +1133,7 @@ resource "aws_subnet" "us-test-1c-existing-iam-example-com" {
"KubernetesCluster" = "existing-iam.example.com"
"Name" = "us-test-1c.existing-iam.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/existing-iam.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

8
tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json
View File

@ -781,6 +781,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"

4
tests/integration/update_cluster/existing_sg/kubernetes.tf
View File

@ -1475,6 +1475,8 @@ resource "aws_subnet" "us-test-1a-existingsg-example-com" {
"KubernetesCluster" = "existingsg.example.com"
"Name" = "us-test-1a.existingsg.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1489,6 +1491,7 @@ resource "aws_subnet" "us-test-1b-existingsg-example-com" {
"KubernetesCluster" = "existingsg.example.com"
"Name" = "us-test-1b.existingsg.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1503,6 +1506,7 @@ resource "aws_subnet" "us-test-1c-existingsg-example-com" {
"KubernetesCluster" = "existingsg.example.com"
"Name" = "us-test-1c.existingsg.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/existingsg.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

8
tests/integration/update_cluster/external_dns/cloudformation.json
View File

@ -785,6 +785,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"

14
tests/integration/update_cluster/external_dns/kubernetes.tf
View File

@ -769,12 +769,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/external_dns_irsa/kubernetes.tf
View File

@ -834,12 +834,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

8
tests/integration/update_cluster/externallb/cloudformation.json
View File

@ -801,6 +801,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/externallb.example.com",
"Value": "owned"

2
tests/integration/update_cluster/externallb/kubernetes.tf
View File

@ -776,6 +776,8 @@ resource "aws_subnet" "us-test-1a-externallb-example-com" {
"KubernetesCluster" = "externallb.example.com"
"Name" = "us-test-1a.externallb.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/externallb.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

2
tests/integration/update_cluster/externalpolicies/kubernetes.tf
View File

@ -966,6 +966,8 @@ resource "aws_subnet" "us-test-1a-externalpolicies-example-com" {
"Owner" = "John Doe"
"SubnetType" = "Public"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/externalpolicies.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

42
tests/integration/update_cluster/ha/kubernetes.tf
View File

@ -1171,12 +1171,14 @@ resource "aws_subnet" "us-test-1a-ha-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1a.ha.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1a.ha.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.ha-example-com.id
}
@ -1185,12 +1187,14 @@ resource "aws_subnet" "us-test-1b-ha-example-com" {
availability_zone = "us-test-1b"
cidr_block = "172.20.64.0/19"
tags = {
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1b.ha.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1b.ha.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.ha-example-com.id
}
@ -1199,12 +1203,14 @@ resource "aws_subnet" "us-test-1c-ha-example-com" {
availability_zone = "us-test-1c"
cidr_block = "172.20.96.0/19"
tags = {
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1c.ha.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "ha.example.com"
"Name" = "us-test-1c.ha.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/ha.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.ha-example-com.id
}

14
tests/integration/update_cluster/irsa/kubernetes.tf
View File

@ -900,12 +900,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

2
tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View File

@ -48,7 +48,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: karpenter.sh/k8s-1.19.yaml
manifestHash: cd6c83c893a2bfb1543fee16c9ae5ebeede469f41556a7830bb50697e4ff7942
manifestHash: 6c7b7d9130ccb04026fa2aa28aa8a318e9882fa15ebd4c1f3b03f5a468a647f8
name: karpenter.sh
selector:
k8s-addon: karpenter.sh

4
tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content
View File

@ -1359,8 +1359,8 @@ spec:
provider:
launchTemplate: karpenter-nodes-default.minimal.example.com
subnetSelector:
kops.k8s.io/instance-group/karpenter-nodes-default: '*'
kubernetes.io/cluster/minimal.example.com: '*'
kubernetes.io/role/internal-elb: "1"
requirements:
- key: karpenter.sh/capacity-type
operator: In
@ -1391,8 +1391,8 @@ spec:
provider:
launchTemplate: karpenter-nodes-single-machinetype.minimal.example.com
subnetSelector:
kops.k8s.io/instance-group/karpenter-nodes-single-machinetype: '*'
kubernetes.io/cluster/minimal.example.com: '*'
kubernetes.io/role/internal-elb: "1"
requirements:
- key: karpenter.sh/capacity-type
operator: In

16
tests/integration/update_cluster/karpenter/kubernetes.tf
View File

@ -1034,12 +1034,16 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/karpenter-nodes-default" = "true"
"kops.k8s.io/instance-group/karpenter-nodes-single-machinetype" = "true"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

3
tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf
View File

@ -133,6 +133,8 @@ resource "aws_subnet" "us-test-1a-lifecyclephases-example-com" {
"KubernetesCluster" = "lifecyclephases.example.com"
"Name" = "us-test-1a.lifecyclephases.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/lifecyclephases.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -146,6 +148,7 @@ resource "aws_subnet" "utility-us-test-1a-lifecyclephases-example-com" {
"KubernetesCluster" = "lifecyclephases.example.com"
"Name" = "utility-us-test-1a.lifecyclephases.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/lifecyclephases.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

14
tests/integration/update_cluster/many-addons-ccm-irsa/kubernetes.tf
View File

@ -1037,12 +1037,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm-irsa23/kubernetes.tf
View File

@ -1047,12 +1047,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm-irsa24/kubernetes.tf
View File

@ -1023,12 +1023,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons-ccm/kubernetes.tf
View File

@ -842,12 +842,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/many-addons/kubernetes.tf
View File

@ -834,12 +834,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-1.23/kubernetes.tf
View File

@ -828,12 +828,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal-1.24/kubernetes.tf
View File

@ -814,12 +814,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

8
tests/integration/update_cluster/minimal-etcd/cloudformation.json
View File

@ -785,6 +785,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal-etcd.example.com",
"Value": "owned"

8
tests/integration/update_cluster/minimal-gp3/cloudformation.json
View File

@ -781,6 +781,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"

14
tests/integration/update_cluster/minimal-gp3/kubernetes.tf
View File

@ -765,12 +765,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

8
tests/integration/update_cluster/minimal-ipv6-calico/cloudformation.json
View File

@ -994,6 +994,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"

2
tests/integration/update_cluster/minimal-ipv6-calico/kubernetes.tf
View File

@ -987,6 +987,8 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

8
tests/integration/update_cluster/minimal-ipv6-cilium/cloudformation.json
View File

@ -997,6 +997,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"

2
tests/integration/update_cluster/minimal-ipv6-cilium/kubernetes.tf
View File

@ -979,6 +979,8 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

3
tests/integration/update_cluster/minimal-ipv6-private/kubernetes.tf
View File

@ -1096,6 +1096,7 @@ resource "aws_subnet" "dualstack-us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "dualstack-us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "DualStack"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1130,6 +1131,7 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id
@ -1146,6 +1148,7 @@ resource "aws_subnet" "us-test-1b-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1b.minimal-ipv6.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
}
vpc_id = aws_vpc.minimal-ipv6-example-com.id

8
tests/integration/update_cluster/minimal-ipv6/cloudformation.json
View File

@ -997,6 +997,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal-ipv6.example.com",
"Value": "owned"

2
tests/integration/update_cluster/minimal-ipv6/kubernetes.tf
View File

@ -971,6 +971,8 @@ resource "aws_subnet" "us-test-1a-minimal-ipv6-example-com" {
"KubernetesCluster" = "minimal-ipv6.example.com"
"Name" = "us-test-1a.minimal-ipv6.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-ipv6.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

8
tests/integration/update_cluster/minimal-longclustername/cloudformation.json
View File

@ -785,6 +785,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com",
"Value": "owned"

2
tests/integration/update_cluster/minimal-longclustername/kubernetes.tf
View File

@ -772,6 +772,8 @@ resource "aws_subnet" "us-test-1a-this-is-truly-a-really-really-long-cluster-nam
"KubernetesCluster" = "this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"Name" = "us-test-1a.this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

2
tests/integration/update_cluster/minimal-warmpool/kubernetes.tf
View File

@ -796,6 +796,8 @@ resource "aws_subnet" "us-test-1a-minimal-warmpool-example-com" {
"KubernetesCluster" = "minimal-warmpool.example.com"
"Name" = "us-test-1a.minimal-warmpool.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal-warmpool.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

8
tests/integration/update_cluster/minimal/cloudformation.json
View File

@ -785,6 +785,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"

14
tests/integration/update_cluster/minimal/kubernetes.tf
View File

@ -769,12 +769,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/minimal_gossip/kubernetes.tf
View File

@ -769,12 +769,14 @@ resource "aws_subnet" "us-test-1a-minimal-k8s-local" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-k8s-local.id
}

14
tests/integration/update_cluster/minimal_gossip_irsa/kubernetes.tf
View File

@ -808,12 +808,14 @@ resource "aws_subnet" "us-test-1a-minimal-k8s-local" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.k8s.local"
"Name" = "us-test-1a.minimal.k8s.local"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.k8s.local" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-k8s-local.id
}

16
tests/integration/update_cluster/mixed_instances/cloudformation.json
View File

@ -1301,6 +1301,10 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned"
@ -1337,6 +1341,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1b",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned"
@ -1373,6 +1385,10 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1c",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned"

4
tests/integration/update_cluster/mixed_instances/kubernetes.tf
View File

@ -1192,6 +1192,7 @@ resource "aws_subnet" "us-test-1a-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1a.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1206,6 +1207,8 @@ resource "aws_subnet" "us-test-1b-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1b.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1220,6 +1223,7 @@ resource "aws_subnet" "us-test-1c-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1c.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

16
tests/integration/update_cluster/mixed_instances_spot/cloudformation.json
View File

@ -1301,6 +1301,10 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned"
@ -1337,6 +1341,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1b",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned"
@ -1373,6 +1385,10 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1c",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/mixedinstances.example.com",
"Value": "owned"

4
tests/integration/update_cluster/mixed_instances_spot/kubernetes.tf
View File

@ -1192,6 +1192,7 @@ resource "aws_subnet" "us-test-1a-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1a.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1206,6 +1207,8 @@ resource "aws_subnet" "us-test-1b-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1b.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1b" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
@ -1220,6 +1223,7 @@ resource "aws_subnet" "us-test-1c-mixedinstances-example-com" {
"KubernetesCluster" = "mixedinstances.example.com"
"Name" = "us-test-1c.mixedinstances.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1c" = "true"
"kubernetes.io/cluster/mixedinstances.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

8
tests/integration/update_cluster/nth_sqs_resources/cloudformation.json
View File

@ -835,6 +835,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/nthsqsresources.longclustername.example.com",
"Value": "owned"

2
tests/integration/update_cluster/nth_sqs_resources/kubernetes.tf
View File

@ -898,6 +898,8 @@ resource "aws_subnet" "us-test-1a-nthsqsresources-longclustername-example-com" {
"KubernetesCluster" = "nthsqsresources.longclustername.example.com"
"Name" = "us-test-1a.nthsqsresources.longclustername.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/nthsqsresources.longclustername.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"

8
tests/integration/update_cluster/nvidia/cloudformation.json
View File

@ -798,6 +798,14 @@
"Key": "SubnetType",
"Value": "Public"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"

14
tests/integration/update_cluster/nvidia/kubernetes.tf
View File

@ -785,12 +785,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

12
tests/integration/update_cluster/private-shared-ip/cloudformation.json
View File

@ -1199,6 +1199,14 @@
"Key": "SubnetType",
"Value": "Private"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/private-shared-ip.example.com",
"Value": "owned"
@ -1229,6 +1237,10 @@
"Key": "SubnetType",
"Value": "Utility"
},
{
"Key": "kops.k8s.io/instance-group/bastion",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/private-shared-ip.example.com",
"Value": "owned"

3
tests/integration/update_cluster/private-shared-ip/kubernetes.tf
View File

@ -1156,6 +1156,8 @@ resource "aws_subnet" "us-test-1a-private-shared-ip-example-com" {
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "us-test-1a.private-shared-ip.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1169,6 +1171,7 @@ resource "aws_subnet" "utility-us-test-1a-private-shared-ip-example-com" {
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "utility-us-test-1a.private-shared-ip.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

12
tests/integration/update_cluster/privatecalico/cloudformation.json
View File

@ -1280,6 +1280,14 @@
"Key": "SubnetType",
"Value": "Private"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privatecalico.example.com",
"Value": "owned"
@ -1312,6 +1320,10 @@
"Key": "SubnetType",
"Value": "Utility"
},
{
"Key": "kops.k8s.io/instance-group/bastion",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privatecalico.example.com",
"Value": "owned"

3
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -1213,6 +1213,8 @@ resource "aws_subnet" "us-test-1a-privatecalico-example-com" {
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "us-test-1a.privatecalico.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1228,6 +1230,7 @@ resource "aws_subnet" "utility-us-test-1a-privatecalico-example-com" {
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "utility-us-test-1a.privatecalico.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -1195,6 +1195,8 @@ resource "aws_subnet" "us-test-1a-privatecanal-example-com" {
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "us-test-1a.privatecanal.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1208,6 +1210,7 @@ resource "aws_subnet" "utility-us-test-1a-privatecanal-example-com" {
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "utility-us-test-1a.privatecanal.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

12
tests/integration/update_cluster/privatecilium/cloudformation.json
View File

@ -1286,6 +1286,14 @@
"Key": "SubnetType",
"Value": "Private"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privatecilium.example.com",
"Value": "owned"
@ -1318,6 +1326,10 @@
"Key": "SubnetType",
"Value": "Utility"
},
{
"Key": "kops.k8s.io/instance-group/bastion",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privatecilium.example.com",
"Value": "owned"

3
tests/integration/update_cluster/privatecilium/kubernetes.tf
View File

@ -1187,6 +1187,8 @@ resource "aws_subnet" "us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1200,6 +1202,7 @@ resource "aws_subnet" "utility-us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "utility-us-test-1a.privatecilium.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

12
tests/integration/update_cluster/privatecilium2/cloudformation.json
View File

@ -1234,6 +1234,14 @@
"Key": "SubnetType",
"Value": "Private"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privatecilium.example.com",
"Value": "owned"
@ -1266,6 +1274,10 @@
"Key": "SubnetType",
"Value": "Utility"
},
{
"Key": "kops.k8s.io/instance-group/bastion",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privatecilium.example.com",
"Value": "owned"

3
tests/integration/update_cluster/privatecilium2/kubernetes.tf
View File

@ -1189,6 +1189,8 @@ resource "aws_subnet" "us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "us-test-1a.privatecilium.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1204,6 +1206,7 @@ resource "aws_subnet" "utility-us-test-1a-privatecilium-example-com" {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "utility-us-test-1a.privatecilium.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

12
tests/integration/update_cluster/privateciliumadvanced/cloudformation.json
View File

@ -1286,6 +1286,14 @@
"Key": "SubnetType",
"Value": "Private"
},
{
"Key": "kops.k8s.io/instance-group/master-us-test-1a",
"Value": "true"
},
{
"Key": "kops.k8s.io/instance-group/nodes",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privateciliumadvanced.example.com",
"Value": "owned"
@ -1318,6 +1326,10 @@
"Key": "SubnetType",
"Value": "Utility"
},
{
"Key": "kops.k8s.io/instance-group/bastion",
"Value": "true"
},
{
"Key": "kubernetes.io/cluster/privateciliumadvanced.example.com",
"Value": "owned"

3
tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf
View File

@ -1219,6 +1219,8 @@ resource "aws_subnet" "us-test-1a-privateciliumadvanced-example-com" {
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "us-test-1a.privateciliumadvanced.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1232,6 +1234,7 @@ resource "aws_subnet" "utility-us-test-1a-privateciliumadvanced-example-com" {
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "utility-us-test-1a.privateciliumadvanced.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -1284,6 +1284,8 @@ resource "aws_subnet" "us-test-1a-privatedns1-example-com" {
"Owner" = "John Doe"
"SubnetType" = "Private"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1299,6 +1301,7 @@ resource "aws_subnet" "utility-us-test-1a-privatedns1-example-com" {
"Owner" = "John Doe"
"SubnetType" = "Utility"
"foo/bar" = "fib+baz"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -1165,6 +1165,8 @@ resource "aws_subnet" "us-test-1a-privatedns2-example-com" {
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "us-test-1a.privatedns2.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1178,6 +1180,7 @@ resource "aws_subnet" "utility-us-test-1a-privatedns2-example-com" {
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "utility-us-test-1a.privatedns2.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -1187,6 +1187,8 @@ resource "aws_subnet" "us-test-1a-privateflannel-example-com" {
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "us-test-1a.privateflannel.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1200,6 +1202,7 @@ resource "aws_subnet" "utility-us-test-1a-privateflannel-example-com" {
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "utility-us-test-1a.privateflannel.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

4
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -1209,6 +1209,8 @@ resource "aws_subnet" "us-test-1a-privatekopeio-example-com" {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "us-test-1a.privatekopeio.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1222,6 +1224,7 @@ resource "aws_subnet" "us-test-1b-privatekopeio-example-com" {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "us-test-1b.privatekopeio.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1235,6 +1238,7 @@ resource "aws_subnet" "utility-us-test-1a-privatekopeio-example-com" {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "utility-us-test-1a.privatekopeio.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

3
tests/integration/update_cluster/privateweave/kubernetes.tf
View File

@ -1187,6 +1187,8 @@ resource "aws_subnet" "us-test-1a-privateweave-example-com" {
"KubernetesCluster" = "privateweave.example.com"
"Name" = "us-test-1a.privateweave.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1200,6 +1202,7 @@ resource "aws_subnet" "utility-us-test-1a-privateweave-example-com" {
"KubernetesCluster" = "privateweave.example.com"
"Name" = "utility-us-test-1a.privateweave.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

14
tests/integration/update_cluster/public-jwks-apiserver/kubernetes.tf
View File

@ -888,12 +888,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
enable_resource_name_dns_a_record_on_launch = true
private_dns_hostname_type_on_launch = "resource-name"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

14
tests/integration/update_cluster/shared_vpc/kubernetes.tf
View File

@ -755,12 +755,14 @@ resource "aws_subnet" "us-test-1a-sharedvpc-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "sharedvpc.example.com"
"Name" = "us-test-1a.sharedvpc.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/sharedvpc.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "sharedvpc.example.com"
"Name" = "us-test-1a.sharedvpc.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/sharedvpc.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = "vpc-12345678"
}

14
tests/integration/update_cluster/unmanaged/kubernetes.tf
View File

@ -1095,11 +1095,13 @@ resource "aws_subnet" "us-test-1a-unmanaged-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "us-test-1a.unmanaged.example.com"
"SubnetType" = "Private"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "us-test-1a.unmanaged.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = "vpc-12345678"
}
@ -1111,6 +1113,7 @@ resource "aws_subnet" "us-test-1b-unmanaged-example-com" {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "us-test-1b.unmanaged.example.com"
"SubnetType" = "Private"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/internal-elb" = "1"
}
@ -1124,6 +1127,7 @@ resource "aws_subnet" "utility-us-test-1a-unmanaged-example-com" {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "utility-us-test-1a.unmanaged.example.com"
"SubnetType" = "Utility"
"kops.k8s.io/instance-group/bastion" = "true"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
}

14
tests/integration/update_cluster/vfs-said/kubernetes.tf
View File

@ -808,12 +808,14 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
availability_zone = "us-test-1a"
cidr_block = "172.20.32.0/19"
tags = {
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
"KubernetesCluster" = "minimal.example.com"
"Name" = "us-test-1a.minimal.example.com"
"SubnetType" = "Public"
"kops.k8s.io/instance-group/master-us-test-1a" = "true"
"kops.k8s.io/instance-group/nodes" = "true"
"kubernetes.io/cluster/minimal.example.com" = "owned"
"kubernetes.io/role/elb" = "1"
"kubernetes.io/role/internal-elb" = "1"
}
vpc_id = aws_vpc.minimal-example-com.id
}

2
upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template
View File

@ -1129,7 +1129,7 @@ spec:
provider:
launchTemplate: {{ $name }}.{{ ClusterName }}
subnetSelector:
kubernetes.io/role/internal-elb: "1"
kops.k8s.io/instance-group/{{ $name }}: "*"
kubernetes.io/cluster/{{ ClusterName }}: "*"
ttlSecondsAfterEmpty: 300
{{ end }}