update-expected.sh

kubernetes · Sep 11, 2020 · 54c280e · 54c280e
1 parent 7069aaa
commit 54c280e
Show file tree

Hide file tree

Showing 53 changed files with 3,341 additions and 1,167 deletions.
diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml
@@ -15,6 +15,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster

diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml
@@ -15,6 +15,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
   some___:x: label

diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml
@@ -15,6 +15,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
   some___:x: label

diff --git a/...servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/...servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml
@@ -65,6 +65,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: master-1-cluster
@@ -141,6 +143,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: master-2-cluster
@@ -217,6 +221,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: master-3-cluster
@@ -293,6 +299,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster
@@ -363,6 +371,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-2-cluster
@@ -433,6 +443,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-3-cluster

diff --git a/.../servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/.../servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml
@@ -66,6 +66,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-a
 Name: master-a-1-cluster
@@ -130,6 +132,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-b
 Name: master-b-1-cluster
@@ -194,6 +198,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-c
 Name: master-c-1-cluster
@@ -264,6 +270,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-a
 Name: node-a-1-cluster
@@ -334,6 +342,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-b
 Name: node-b-1-cluster
@@ -404,6 +414,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-c
 Name: node-c-1-cluster

diff --git a/...l/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/...l/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml
@@ -73,6 +73,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-a
 Name: master-a-1-cluster
@@ -149,6 +151,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-b
 Name: master-b-1-cluster
@@ -225,6 +229,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-c
 Name: master-c-1-cluster
@@ -301,6 +307,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-a
 Name: node-a-1-cluster
@@ -371,6 +379,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-b
 Name: node-b-1-cluster
@@ -441,6 +451,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-c
 Name: node-c-1-cluster

diff --git a/...ackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml b/...ackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml
@@ -25,6 +25,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-a
 Name: master-a-1-cluster
@@ -95,6 +97,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-b
 Name: master-b-1-cluster
@@ -165,6 +169,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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-c
 Name: master-c-1-cluster
@@ -235,6 +241,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-a
 Name: node-a-1-cluster
@@ -299,6 +307,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-b
 Name: node-b-1-cluster
@@ -363,6 +373,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node-c
 Name: node-c-1-cluster

diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml
@@ -18,6 +18,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: bastion-1-cluster
@@ -82,6 +84,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: master-1-cluster
@@ -152,6 +156,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster

diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml
@@ -38,6 +38,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: bastion-1-cluster
@@ -108,6 +110,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: master-1-cluster
@@ -178,6 +182,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster

diff --git a/...model/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml b/...model/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml
@@ -17,6 +17,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: master-1-cluster
@@ -87,6 +89,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster

diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml
@@ -37,6 +37,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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
 Name: master-1-cluster
@@ -113,6 +115,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster

diff --git a/...ackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml b/...ackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml
@@ -15,6 +15,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster

diff --git a/...del/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml b/...del/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml
@@ -15,6 +15,8 @@ Metadata:
   cluster_generation: "0"
   ig_generation: "0"
   k8s: cluster
+  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: node
 Name: node-1-cluster