updating integration tests

tests/integration/update_cluster/additional_user-data/cloudformation.json

@@ -169,6 +169,10 @@
           {
             "Key": "Name",
             "Value": "additionaluserdata.example.com"
+          },
+          {
+            "Key": "kubernetes.io/cluster/additionaluserdata.example.com",
+            "Value": "owned"
           }
         ]
       }
@@ -184,6 +188,10 @@
           {
             "Key": "Name",
             "Value": "additionaluserdata.example.com"
+          },
+          {
+            "Key": "kubernetes.io/cluster/additionaluserdata.example.com",
+            "Value": "owned"
           }
         ]
       }
@@ -214,6 +222,10 @@
           {
             "Key": "Name",
             "Value": "additionaluserdata.example.com"
+          },
+          {
+            "Key": "kubernetes.io/cluster/additionaluserdata.example.com",
+            "Value": "owned"
           }
         ]
       }

tests/integration/update_cluster/complex/kubernetes.tf

@@ -228,6 +228,7 @@ resource "aws_internet_gateway" "complex-example-com" {
   tags = {
     KubernetesCluster                           = "complex.example.com"
     Name                                        = "complex.example.com"
+    "kubernetes.io/cluster/complex.example.com" = "owned"
   }
 }
 
@@ -308,6 +309,7 @@ resource "aws_route_table" "complex-example-com" {
   tags = {
     KubernetesCluster                           = "complex.example.com"
     Name                                        = "complex.example.com"
+    "kubernetes.io/cluster/complex.example.com" = "owned"
   }
 }
 
@@ -544,6 +546,7 @@ resource "aws_vpc_dhcp_options" "complex-example-com" {
   tags = {
     KubernetesCluster                           = "complex.example.com"
     Name                                        = "complex.example.com"
+    "kubernetes.io/cluster/complex.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/ha/kubernetes.tf

@@ -280,6 +280,7 @@ resource "aws_internet_gateway" "ha-example-com" {
   tags = {
     KubernetesCluster                      = "ha.example.com"
     Name                                   = "ha.example.com"
+    "kubernetes.io/cluster/ha.example.com" = "owned"
   }
 }
 
@@ -399,6 +400,7 @@ resource "aws_route_table" "ha-example-com" {
   tags = {
     KubernetesCluster                      = "ha.example.com"
     Name                                   = "ha.example.com"
+    "kubernetes.io/cluster/ha.example.com" = "owned"
   }
 }
 
@@ -608,6 +610,7 @@ resource "aws_vpc_dhcp_options" "ha-example-com" {
   tags = {
     KubernetesCluster                      = "ha.example.com"
     Name                                   = "ha.example.com"
+    "kubernetes.io/cluster/ha.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/lifecycle_phases/network-kubernetes.tf

@@ -24,6 +24,7 @@ resource "aws_internet_gateway" "privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 
@@ -50,6 +51,7 @@ resource "aws_route_table" "private-us-test-1a-privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "private-us-test-1a.privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 
@@ -59,6 +61,7 @@ resource "aws_route_table" "privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 
@@ -119,6 +122,7 @@ resource "aws_vpc_dhcp_options" "privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/minimal-141/kubernetes.tf

@@ -166,6 +166,7 @@ resource "aws_internet_gateway" "minimal-141-example-com" {
   tags = {
     KubernetesCluster                               = "minimal-141.example.com"
     Name                                            = "minimal-141.example.com"
+    "kubernetes.io/cluster/minimal-141.example.com" = "owned"
   }
 }
 
@@ -233,6 +234,7 @@ resource "aws_route_table" "minimal-141-example-com" {
   tags = {
     KubernetesCluster                               = "minimal-141.example.com"
     Name                                            = "minimal-141.example.com"
+    "kubernetes.io/cluster/minimal-141.example.com" = "owned"
   }
 }
 
@@ -404,6 +406,7 @@ resource "aws_vpc_dhcp_options" "minimal-141-example-com" {
   tags = {
     KubernetesCluster                               = "minimal-141.example.com"
     Name                                            = "minimal-141.example.com"
+    "kubernetes.io/cluster/minimal-141.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/minimal-cloudformation/cloudformation.json

@@ -169,6 +169,10 @@
           {
             "Key": "Name",
             "Value": "minimal.example.com"
+          },
+          {
+            "Key": "kubernetes.io/cluster/minimal.example.com",
+            "Value": "owned"
           }
         ]
       }
@@ -184,6 +188,10 @@
           {
             "Key": "Name",
             "Value": "minimal.example.com"
+          },
+          {
+            "Key": "kubernetes.io/cluster/minimal.example.com",
+            "Value": "owned"
           }
         ]
       }
@@ -214,6 +222,10 @@
           {
             "Key": "Name",
             "Value": "minimal.example.com"
+          },
+          {
+            "Key": "kubernetes.io/cluster/minimal.example.com",
+            "Value": "owned"
           }
         ]
       }

tests/integration/update_cluster/minimal/kubernetes.tf

@@ -166,6 +166,7 @@ resource "aws_internet_gateway" "minimal-example-com" {
   tags = {
     KubernetesCluster                           = "minimal.example.com"
     Name                                        = "minimal.example.com"
+    "kubernetes.io/cluster/minimal.example.com" = "owned"
   }
 }
 
@@ -233,6 +234,7 @@ resource "aws_route_table" "minimal-example-com" {
   tags = {
     KubernetesCluster                           = "minimal.example.com"
     Name                                        = "minimal.example.com"
+    "kubernetes.io/cluster/minimal.example.com" = "owned"
   }
 }
 
@@ -404,6 +406,7 @@ resource "aws_vpc_dhcp_options" "minimal-example-com" {
   tags = {
     KubernetesCluster                           = "minimal.example.com"
     Name                                        = "minimal.example.com"
+    "kubernetes.io/cluster/minimal.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/privatecalico/kubernetes.tf

@@ -295,6 +295,7 @@ resource "aws_internet_gateway" "privatecalico-example-com" {
   tags = {
     KubernetesCluster                                 = "privatecalico.example.com"
     Name                                              = "privatecalico.example.com"
+    "kubernetes.io/cluster/privatecalico.example.com" = "owned"
   }
 }
 
@@ -406,6 +407,7 @@ resource "aws_route_table" "private-us-test-1a-privatecalico-example-com" {
   tags = {
     KubernetesCluster                                 = "privatecalico.example.com"
     Name                                              = "private-us-test-1a.privatecalico.example.com"
+    "kubernetes.io/cluster/privatecalico.example.com" = "owned"
   }
 }
 
@@ -415,6 +417,7 @@ resource "aws_route_table" "privatecalico-example-com" {
   tags = {
     KubernetesCluster                                 = "privatecalico.example.com"
     Name                                              = "privatecalico.example.com"
+    "kubernetes.io/cluster/privatecalico.example.com" = "owned"
   }
 }
 
@@ -701,6 +704,7 @@ resource "aws_vpc_dhcp_options" "privatecalico-example-com" {
   tags = {
     KubernetesCluster                                 = "privatecalico.example.com"
     Name                                              = "privatecalico.example.com"
+    "kubernetes.io/cluster/privatecalico.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/privatecanal/kubernetes.tf

@@ -295,6 +295,7 @@ resource "aws_internet_gateway" "privatecanal-example-com" {
   tags = {
     KubernetesCluster                                = "privatecanal.example.com"
     Name                                             = "privatecanal.example.com"
+    "kubernetes.io/cluster/privatecanal.example.com" = "owned"
   }
 }
 
@@ -406,6 +407,7 @@ resource "aws_route_table" "private-us-test-1a-privatecanal-example-com" {
   tags = {
     KubernetesCluster                                = "privatecanal.example.com"
     Name                                             = "private-us-test-1a.privatecanal.example.com"
+    "kubernetes.io/cluster/privatecanal.example.com" = "owned"
   }
 }
 
@@ -415,6 +417,7 @@ resource "aws_route_table" "privatecanal-example-com" {
   tags = {
     KubernetesCluster                                = "privatecanal.example.com"
     Name                                             = "privatecanal.example.com"
+    "kubernetes.io/cluster/privatecanal.example.com" = "owned"
   }
 }
 
@@ -692,6 +695,7 @@ resource "aws_vpc_dhcp_options" "privatecanal-example-com" {
   tags = {
     KubernetesCluster                                = "privatecanal.example.com"
     Name                                             = "privatecanal.example.com"
+    "kubernetes.io/cluster/privatecanal.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/privatedns1/kubernetes.tf

@@ -295,6 +295,7 @@ resource "aws_internet_gateway" "privatedns1-example-com" {
   tags = {
     KubernetesCluster                               = "privatedns1.example.com"
     Name                                            = "privatedns1.example.com"
+    "kubernetes.io/cluster/privatedns1.example.com" = "owned"
   }
 }
 
@@ -411,6 +412,7 @@ resource "aws_route_table" "private-us-test-1a-privatedns1-example-com" {
   tags = {
     KubernetesCluster                               = "privatedns1.example.com"
     Name                                            = "private-us-test-1a.privatedns1.example.com"
+    "kubernetes.io/cluster/privatedns1.example.com" = "owned"
   }
 }
 
@@ -420,6 +422,7 @@ resource "aws_route_table" "privatedns1-example-com" {
   tags = {
     KubernetesCluster                               = "privatedns1.example.com"
     Name                                            = "privatedns1.example.com"
+    "kubernetes.io/cluster/privatedns1.example.com" = "owned"
   }
 }
 
@@ -697,6 +700,7 @@ resource "aws_vpc_dhcp_options" "privatedns1-example-com" {
   tags = {
     KubernetesCluster                               = "privatedns1.example.com"
     Name                                            = "privatedns1.example.com"
+    "kubernetes.io/cluster/privatedns1.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/privatedns2/kubernetes.tf

@@ -396,7 +396,7 @@ resource "aws_route_table" "private-us-test-1a-privatedns2-example-com" {
 
   tags = {
     KubernetesCluster                               = "privatedns2.example.com"
-    Name              = "private-us-test-1a.privatedns2.example.com"
+    "kubernetes.io/cluster/privatedns2.example.com" = "shared"
   }
 }
 
@@ -405,7 +405,7 @@ resource "aws_route_table" "privatedns2-example-com" {
 
   tags = {
     KubernetesCluster                               = "privatedns2.example.com"
-    Name              = "privatedns2.example.com"
+    "kubernetes.io/cluster/privatedns2.example.com" = "shared"
   }
 }
 

tests/integration/update_cluster/privateflannel/kubernetes.tf

@@ -295,6 +295,7 @@ resource "aws_internet_gateway" "privateflannel-example-com" {
   tags = {
     KubernetesCluster                                  = "privateflannel.example.com"
     Name                                               = "privateflannel.example.com"
+    "kubernetes.io/cluster/privateflannel.example.com" = "owned"
   }
 }
 
@@ -406,6 +407,7 @@ resource "aws_route_table" "private-us-test-1a-privateflannel-example-com" {
   tags = {
     KubernetesCluster                                  = "privateflannel.example.com"
     Name                                               = "private-us-test-1a.privateflannel.example.com"
+    "kubernetes.io/cluster/privateflannel.example.com" = "owned"
   }
 }
 
@@ -415,6 +417,7 @@ resource "aws_route_table" "privateflannel-example-com" {
   tags = {
     KubernetesCluster                                  = "privateflannel.example.com"
     Name                                               = "privateflannel.example.com"
+    "kubernetes.io/cluster/privateflannel.example.com" = "owned"
   }
 }
 
@@ -692,6 +695,7 @@ resource "aws_vpc_dhcp_options" "privateflannel-example-com" {
   tags = {
     KubernetesCluster                                  = "privateflannel.example.com"
     Name                                               = "privateflannel.example.com"
+    "kubernetes.io/cluster/privateflannel.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/privatekopeio/kubernetes.tf

@@ -291,6 +291,7 @@ resource "aws_internet_gateway" "privatekopeio-example-com" {
   tags = {
     KubernetesCluster                                 = "privatekopeio.example.com"
     Name                                              = "privatekopeio.example.com"
+    "kubernetes.io/cluster/privatekopeio.example.com" = "owned"
   }
 }
 
@@ -397,6 +398,7 @@ resource "aws_route_table" "private-us-test-1a-privatekopeio-example-com" {
   tags = {
     KubernetesCluster                                 = "privatekopeio.example.com"
     Name                                              = "private-us-test-1a.privatekopeio.example.com"
+    "kubernetes.io/cluster/privatekopeio.example.com" = "owned"
   }
 }
 
@@ -406,6 +408,7 @@ resource "aws_route_table" "privatekopeio-example-com" {
   tags = {
     KubernetesCluster                                 = "privatekopeio.example.com"
     Name                                              = "privatekopeio.example.com"
+    "kubernetes.io/cluster/privatekopeio.example.com" = "owned"
   }
 }
 
@@ -683,6 +686,7 @@ resource "aws_vpc_dhcp_options" "privatekopeio-example-com" {
   tags = {
     KubernetesCluster                                 = "privatekopeio.example.com"
     Name                                              = "privatekopeio.example.com"
+    "kubernetes.io/cluster/privatekopeio.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/privateweave/kubernetes.tf

@@ -295,6 +295,7 @@ resource "aws_internet_gateway" "privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 
@@ -406,6 +407,7 @@ resource "aws_route_table" "private-us-test-1a-privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "private-us-test-1a.privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 
@@ -415,6 +417,7 @@ resource "aws_route_table" "privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 
@@ -692,6 +695,7 @@ resource "aws_vpc_dhcp_options" "privateweave-example-com" {
   tags = {
     KubernetesCluster                                = "privateweave.example.com"
     Name                                             = "privateweave.example.com"
+    "kubernetes.io/cluster/privateweave.example.com" = "owned"
   }
 }
 

tests/integration/update_cluster/shared_vpc/kubernetes.tf

@@ -223,7 +223,7 @@ resource "aws_route_table" "sharedvpc-example-com" {
 
   tags = {
     KubernetesCluster                             = "sharedvpc.example.com"
-    Name              = "sharedvpc.example.com"
+    "kubernetes.io/cluster/sharedvpc.example.com" = "shared"
   }
 }