Skip to content

Commit

Permalink
Ignore lack of tags on launch templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@johngmyers
johngmyers committed Jul 19, 2020
1 parent 764851e commit 518f598
Show file tree
Hide file tree
Showing 40 changed files with 2,443 additions and 2,442 deletions.
1 change: 1 addition & 0 deletions cmd/kops/lifecycle_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ func runLifecycleTest(h *testutils.IntegrationTestHarness, o *LifecycleTestOptio
switch resource {
case "ami":
case "sshkey":
case "lt":
// ignore

default:
Expand Down
132 changes: 66 additions & 66 deletions tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,24 +141,24 @@ resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" {
value = "bastion.bastionuserdata.example.com"
}
tag {
key = "k8s.io/role/bastion"
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "1"
value = "node"
}
tag {
key = "kops.k8s.io/instancegroup"
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = "bastion"
value = ""
}
tag {
key = "kops.k8s.io/label/kubernetes.io/role"
key = "k8s.io/role/bastion"
propagate_at_launch = true
value = "node"
value = "1"
}
tag {
key = "kops.k8s.io/label/node-role.kubernetes.io/node"
key = "kops.k8s.io/instancegroup"
propagate_at_launch = true
value = ""
value = "bastion"
}
tag {
key = "kubernetes.io/cluster/bastionuserdata.example.com"
Expand Down Expand Up @@ -189,24 +189,24 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-bastionuserdata-exam
value = "master-us-test-1a.masters.bastionuserdata.example.com"
}
tag {
key = "k8s.io/role/master"
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "1"
value = "master"
}
tag {
key = "kops.k8s.io/instancegroup"
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/master"
propagate_at_launch = true
value = "master-us-test-1a"
value = ""
}
tag {
key = "kops.k8s.io/label/kubernetes.io/role"
key = "k8s.io/role/master"
propagate_at_launch = true
value = "master"
value = "1"
}
tag {
key = "kops.k8s.io/label/node-role.kubernetes.io/master"
key = "kops.k8s.io/instancegroup"
propagate_at_launch = true
value = ""
value = "master-us-test-1a"
}
tag {
key = "kubernetes.io/cluster/bastionuserdata.example.com"
Expand Down Expand Up @@ -237,24 +237,24 @@ resource "aws_autoscaling_group" "nodes-bastionuserdata-example-com" {
value = "nodes.bastionuserdata.example.com"
}
tag {
key = "k8s.io/role/node"
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "1"
value = "node"
}
tag {
key = "kops.k8s.io/instancegroup"
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = "nodes"
value = ""
}
tag {
key = "kops.k8s.io/label/kubernetes.io/role"
key = "k8s.io/role/node"
propagate_at_launch = true
value = "node"
value = "1"
}
tag {
key = "kops.k8s.io/label/node-role.kubernetes.io/node"
key = "kops.k8s.io/instancegroup"
propagate_at_launch = true
value = ""
value = "nodes"
}
tag {
key = "kubernetes.io/cluster/bastionuserdata.example.com"
Expand Down Expand Up @@ -443,25 +443,25 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kops.k8s.io/label/kubernetes.io/role" = "node"
"kops.k8s.io/label/node-role.kubernetes.io/node" = ""
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kops.k8s.io/label/kubernetes.io/role" = "node"
"kops.k8s.io/label/node-role.kubernetes.io/node" = ""
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
user_data = filebase64("${path.module}/data/aws_launch_template_bastion.bastionuserdata.example.com_user_data")
Expand Down Expand Up @@ -498,25 +498,25 @@ resource "aws_launch_template" "master-us-test-1a-masters-bastionuserdata-exampl
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "master-us-test-1a.masters.bastionuserdata.example.com"
"k8s.io/role/master" = "1"
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kops.k8s.io/label/kubernetes.io/role" = "master"
"kops.k8s.io/label/node-role.kubernetes.io/master" = ""
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "master-us-test-1a.masters.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "master"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/master" = ""
"k8s.io/role/master" = "1"
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "master-us-test-1a.masters.bastionuserdata.example.com"
"k8s.io/role/master" = "1"
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kops.k8s.io/label/kubernetes.io/role" = "master"
"kops.k8s.io/label/node-role.kubernetes.io/master" = ""
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "master-us-test-1a.masters.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "master"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/master" = ""
"k8s.io/role/master" = "1"
"kops.k8s.io/instancegroup" = "master-us-test-1a"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
user_data = filebase64("${path.module}/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data")
Expand Down Expand Up @@ -549,25 +549,25 @@ resource "aws_launch_template" "nodes-bastionuserdata-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "nodes.bastionuserdata.example.com"
"k8s.io/role/node" = "1"
"kops.k8s.io/instancegroup" = "nodes"
"kops.k8s.io/label/kubernetes.io/role" = "node"
"kops.k8s.io/label/node-role.kubernetes.io/node" = ""
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "nodes.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/node" = "1"
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "nodes.bastionuserdata.example.com"
"k8s.io/role/node" = "1"
"kops.k8s.io/instancegroup" = "nodes"
"kops.k8s.io/label/kubernetes.io/role" = "node"
"kops.k8s.io/label/node-role.kubernetes.io/node" = ""
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "nodes.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/node" = "1"
"kops.k8s.io/instancegroup" = "nodes"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
user_data = filebase64("${path.module}/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data")
Expand Down
Loading

0 comments on commit 518f598

Please sign in to comment.