From 7d4a8f6fa73d54731a85c115066018b30431cf6c Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sun, 30 May 2021 12:40:33 -0700 Subject: [PATCH] hack/update-expected.sh --- .../servergroup/adds-additional-security-groups.yaml | 2 +- .../adds-cloud-labels-from-ClusterSpec.yaml | 2 +- .../adds-cloud-labels-from-InstanceGroupSpec.yaml | 2 +- ...gures-server-group-affinity-with-annotations.yaml | 2 +- ...nodes-without-bastion-auto-zone-distribution.yaml | 12 ++++++------ ...-nodes-without-bastion-with-API-loadbalancer.yaml | 12 ++++++------ ...zone-setup-3-masters-3-nodes-without-bastion.yaml | 12 ++++++------ ...up-3-masters-3-nodes-without-external-router.yaml | 12 ++++++------ .../one-master-one-node-one-bastion-2.yaml | 6 +++--- .../servergroup/one-master-one-node-one-bastion.yaml | 6 +++--- ...ode-without-bastion-no-public-ip-association.yaml | 4 ++-- .../tests/servergroup/one-master-one-node.yaml | 4 ++-- ...-group-subnet-as-availability-zones-fallback.yaml | 2 +- ...s-instance-group-zones-as-availability-zones.yaml | 2 +- 14 files changed, 40 insertions(+), 40 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 index 5b0e1bbdea..0a8a9b44bc 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -7,7 +7,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: 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 index fd29f9225b..f581f9b7e3 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml @@ -7,7 +7,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster 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 index fd29f9225b..f581f9b7e3 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml @@ -7,7 +7,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml index 160fd60441..3ac180d7eb 100644 --- a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml @@ -7,7 +7,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml index 68bbec6037..e89bd3056b 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml @@ -57,7 +57,7 @@ ForAPIServer: false GroupName: master ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master KopsName: master-1-cluster @@ -138,7 +138,7 @@ ForAPIServer: false GroupName: master ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master KopsName: master-2-cluster @@ -219,7 +219,7 @@ ForAPIServer: false GroupName: master ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master KopsName: master-3-cluster @@ -300,7 +300,7 @@ ForAPIServer: false GroupName: node ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster @@ -372,7 +372,7 @@ ForAPIServer: false GroupName: node ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-2-cluster @@ -444,7 +444,7 @@ ForAPIServer: false GroupName: node ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-3-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml index a8adb9ade9..8c9d3eae2a 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml @@ -58,7 +58,7 @@ ForAPIServer: false GroupName: master-a ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-a KopsName: master-a-1-cluster @@ -127,7 +127,7 @@ ForAPIServer: false GroupName: master-b ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-b KopsName: master-b-1-cluster @@ -196,7 +196,7 @@ ForAPIServer: false GroupName: master-c ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-c KopsName: master-c-1-cluster @@ -271,7 +271,7 @@ ForAPIServer: false GroupName: node-a ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-a KopsName: node-a-1-cluster @@ -343,7 +343,7 @@ ForAPIServer: false GroupName: node-b ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-b KopsName: node-b-1-cluster @@ -415,7 +415,7 @@ ForAPIServer: false GroupName: node-c ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-c KopsName: node-c-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml index 403c2cf491..6a45b4127c 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml @@ -65,7 +65,7 @@ ForAPIServer: false GroupName: master-a ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-a KopsName: master-a-1-cluster @@ -146,7 +146,7 @@ ForAPIServer: false GroupName: master-b ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-b KopsName: master-b-1-cluster @@ -227,7 +227,7 @@ ForAPIServer: false GroupName: master-c ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-c KopsName: master-c-1-cluster @@ -308,7 +308,7 @@ ForAPIServer: false GroupName: node-a ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-a KopsName: node-a-1-cluster @@ -380,7 +380,7 @@ ForAPIServer: false GroupName: node-b ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-b KopsName: node-b-1-cluster @@ -452,7 +452,7 @@ ForAPIServer: false GroupName: node-c ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-c KopsName: node-c-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml index 2089682a71..f0ff53abe1 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml @@ -17,7 +17,7 @@ ForAPIServer: false GroupName: master-a ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-a KopsName: master-a-1-cluster @@ -92,7 +92,7 @@ ForAPIServer: false GroupName: master-b ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-b KopsName: master-b-1-cluster @@ -167,7 +167,7 @@ ForAPIServer: false GroupName: master-c ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master-c KopsName: master-c-1-cluster @@ -242,7 +242,7 @@ ForAPIServer: false GroupName: node-a ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-a KopsName: node-a-1-cluster @@ -308,7 +308,7 @@ ForAPIServer: false GroupName: node-b ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-b KopsName: node-b-1-cluster @@ -374,7 +374,7 @@ ForAPIServer: false GroupName: node-c ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node-c KopsName: 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 index d57b2ea6d4..efaadd8c82 100644 --- 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 @@ -11,7 +11,7 @@ ForAPIServer: false GroupName: bastion ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: bastion KopsName: bastion-1-cluster @@ -76,7 +76,7 @@ ForAPIServer: false GroupName: master ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master KopsName: master-1-cluster @@ -151,7 +151,7 @@ ForAPIServer: false GroupName: node ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: 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 index 3ce1829c54..3bef65ad21 100644 --- 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 @@ -31,7 +31,7 @@ ForAPIServer: false GroupName: bastion ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: bastion KopsName: bastion-1-cluster @@ -102,7 +102,7 @@ ForAPIServer: false GroupName: master ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master KopsName: master-1-cluster @@ -177,7 +177,7 @@ ForAPIServer: false GroupName: node ID: null Image: image -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml index 52f6548bbe..0ebbd1317d 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml @@ -9,7 +9,7 @@ ForAPIServer: false GroupName: master ID: null Image: image-master -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master KopsName: master-1-cluster @@ -84,7 +84,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: 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 index d21e52dc09..55f81fa9a8 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -29,7 +29,7 @@ ForAPIServer: false GroupName: master ID: null Image: image-master -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: master KopsName: master-1-cluster @@ -110,7 +110,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml index fd2c9bf41e..0f9ee34b92 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml @@ -7,7 +7,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml index a0fb9eda23..1247fd6e21 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml @@ -7,7 +7,7 @@ ForAPIServer: false GroupName: node ID: null Image: image-node -Lifecycle: null +Lifecycle: Sync Metadata: KopsInstanceGroup: node KopsName: node-1-cluster