Skip to content

Commit

Permalink
update-expected.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
@johngmyers
johngmyers committed Aug 17, 2020
1 parent 015da3c commit e8c4c52
Show file tree
Hide file tree
Showing 39 changed files with 2,672 additions and 758 deletions.
102 changes: 72 additions & 30 deletions tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,16 @@ resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" {
propagate_at_launch = true
value = "bastion.bastionuserdata.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "node"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
Expand Down Expand Up @@ -178,6 +188,16 @@ resource "aws_autoscaling_group" "master-us-test-1a-masters-bastionuserdata-exam
propagate_at_launch = true
value = "master-us-test-1a.masters.bastionuserdata.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "master"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/master"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/master"
propagate_at_launch = true
Expand Down Expand Up @@ -216,6 +236,16 @@ resource "aws_autoscaling_group" "nodes-bastionuserdata-example-com" {
propagate_at_launch = true
value = "nodes.bastionuserdata.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "node"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/node"
propagate_at_launch = true
Expand Down Expand Up @@ -418,21 +448,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"
"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"
"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 @@ -469,21 +503,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"
"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"
"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 @@ -516,21 +554,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"
"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"
"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
52 changes: 52 additions & 0 deletions tests/integration/update_cluster/complex/cloudformation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@
"Value": "fib+baz",
"PropagateAtLaunch": true
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role",
"Value": "master",
"PropagateAtLaunch": true
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/master",
"Value": "",
"PropagateAtLaunch": true
},
{
"Key": "k8s.io/role/master",
"Value": "1",
Expand Down Expand Up @@ -124,6 +134,16 @@
"Value": "fib+baz",
"PropagateAtLaunch": true
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role",
"Value": "node",
"PropagateAtLaunch": true
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node",
"Value": "",
"PropagateAtLaunch": true
},
{
"Key": "k8s.io/role/node",
"Value": "1",
Expand Down Expand Up @@ -273,6 +293,14 @@
"Key": "foo/bar",
"Value": "fib+baz"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role",
"Value": "master"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/master",
"Value": ""
},
{
"Key": "k8s.io/role/master",
"Value": "1"
Expand Down Expand Up @@ -306,6 +334,14 @@
"Key": "foo/bar",
"Value": "fib+baz"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role",
"Value": "master"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/master",
"Value": ""
},
{
"Key": "k8s.io/role/master",
"Value": "1"
Expand Down Expand Up @@ -389,6 +425,14 @@
"Key": "foo/bar",
"Value": "fib+baz"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role",
"Value": "node"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node",
"Value": ""
},
{
"Key": "k8s.io/role/node",
"Value": "1"
Expand Down Expand Up @@ -422,6 +466,14 @@
"Key": "foo/bar",
"Value": "fib+baz"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role",
"Value": "node"
},
{
"Key": "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node",
"Value": ""
},
{
"Key": "k8s.io/role/node",
"Value": "1"
Expand Down
Loading

0 comments on commit e8c4c52

Please sign in to comment.