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 43b31fd045..273181e305 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -58,7 +58,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -98,7 +97,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 36085eec29..22baa76de1 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 @@ -57,7 +57,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -96,7 +95,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 36085eec29..22baa76de1 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 @@ -57,7 +57,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -96,7 +95,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 8d7bacdf06..40d6a414c7 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 @@ -113,7 +113,6 @@ ServerGroup: IGName: master Lifecycle: Sync MaxSize: 3 - Members: null Name: cluster-master Policies: - anti-affinity @@ -190,7 +189,6 @@ ServerGroup: IGName: master Lifecycle: Sync MaxSize: 3 - Members: null Name: cluster-master Policies: - anti-affinity @@ -267,7 +265,6 @@ ServerGroup: IGName: master Lifecycle: Sync MaxSize: 3 - Members: null Name: cluster-master Policies: - anti-affinity @@ -337,7 +334,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 3 - Members: null Name: cluster-node Policies: - anti-affinity @@ -407,7 +403,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 3 - Members: null Name: cluster-node Policies: - anti-affinity @@ -477,7 +472,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 3 - Members: null Name: cluster-node Policies: - anti-affinity @@ -664,7 +658,6 @@ ID: null IGName: master Lifecycle: Sync MaxSize: 3 -Members: null Name: cluster-master Policies: - anti-affinity @@ -674,7 +667,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 3 -Members: null Name: cluster-node Policies: - anti-affinity 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 e5eb307b96..257f7bceb9 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 @@ -108,7 +108,6 @@ ServerGroup: IGName: master-a Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-a Policies: - anti-affinity @@ -173,7 +172,6 @@ ServerGroup: IGName: master-b Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-b Policies: - anti-affinity @@ -238,7 +236,6 @@ ServerGroup: IGName: master-c Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-c Policies: - anti-affinity @@ -308,7 +305,6 @@ ServerGroup: IGName: node-a Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-a Policies: - anti-affinity @@ -378,7 +374,6 @@ ServerGroup: IGName: node-b Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-b Policies: - anti-affinity @@ -448,7 +443,6 @@ ServerGroup: IGName: node-c Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-c Policies: - anti-affinity @@ -540,7 +534,6 @@ ServerGroup: IGName: master-a Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-a Policies: - anti-affinity @@ -574,7 +567,6 @@ ServerGroup: IGName: master-b Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-b Policies: - anti-affinity @@ -608,7 +600,6 @@ ServerGroup: IGName: master-c Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-c Policies: - anti-affinity @@ -774,7 +765,6 @@ ID: null IGName: master-a Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-a Policies: - anti-affinity @@ -784,7 +774,6 @@ ID: null IGName: master-b Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-b Policies: - anti-affinity @@ -794,7 +783,6 @@ ID: null IGName: master-c Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-c Policies: - anti-affinity @@ -804,7 +792,6 @@ ID: null IGName: node-a Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-a Policies: - anti-affinity @@ -814,7 +801,6 @@ ID: null IGName: node-b Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-b Policies: - anti-affinity @@ -824,7 +810,6 @@ ID: null IGName: node-c Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-c Policies: - anti-affinity 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 6c82b76109..c44cc7e869 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 @@ -121,7 +121,6 @@ ServerGroup: IGName: master-a Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-a Policies: - anti-affinity @@ -198,7 +197,6 @@ ServerGroup: IGName: master-b Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-b Policies: - anti-affinity @@ -275,7 +273,6 @@ ServerGroup: IGName: master-c Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-c Policies: - anti-affinity @@ -345,7 +342,6 @@ ServerGroup: IGName: node-a Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-a Policies: - anti-affinity @@ -415,7 +411,6 @@ ServerGroup: IGName: node-b Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-b Policies: - anti-affinity @@ -485,7 +480,6 @@ ServerGroup: IGName: node-c Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-c Policies: - anti-affinity @@ -672,7 +666,6 @@ ID: null IGName: master-a Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-a Policies: - anti-affinity @@ -682,7 +675,6 @@ ID: null IGName: master-b Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-b Policies: - anti-affinity @@ -692,7 +684,6 @@ ID: null IGName: master-c Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-c Policies: - anti-affinity @@ -702,7 +693,6 @@ ID: null IGName: node-a Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-a Policies: - anti-affinity @@ -712,7 +702,6 @@ ID: null IGName: node-b Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-b Policies: - anti-affinity @@ -722,7 +711,6 @@ ID: null IGName: node-c Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-c Policies: - anti-affinity 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 d5705aac41..4720d5a800 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 @@ -73,7 +73,6 @@ ServerGroup: IGName: master-a Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-a Policies: - anti-affinity @@ -144,7 +143,6 @@ ServerGroup: IGName: master-b Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-b Policies: - anti-affinity @@ -215,7 +213,6 @@ ServerGroup: IGName: master-c Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master-c Policies: - anti-affinity @@ -279,7 +276,6 @@ ServerGroup: IGName: node-a Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-a Policies: - anti-affinity @@ -343,7 +339,6 @@ ServerGroup: IGName: node-b Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-b Policies: - anti-affinity @@ -407,7 +402,6 @@ ServerGroup: IGName: node-c Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node-c Policies: - anti-affinity @@ -594,7 +588,6 @@ ID: null IGName: master-a Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-a Policies: - anti-affinity @@ -604,7 +597,6 @@ ID: null IGName: master-b Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-b Policies: - anti-affinity @@ -614,7 +606,6 @@ ID: null IGName: master-c Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master-c Policies: - anti-affinity @@ -624,7 +615,6 @@ ID: null IGName: node-a Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-a Policies: - anti-affinity @@ -634,7 +624,6 @@ ID: null IGName: node-b Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-b Policies: - anti-affinity @@ -644,7 +633,6 @@ ID: null IGName: node-c Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node-c Policies: - anti-affinity 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 8950191d99..80301451a9 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 @@ -59,7 +59,6 @@ ServerGroup: IGName: bastion Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-bastion Policies: - anti-affinity @@ -130,7 +129,6 @@ ServerGroup: IGName: master Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master Policies: - anti-affinity @@ -194,7 +192,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -291,7 +288,6 @@ ID: null IGName: bastion Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-bastion Policies: - anti-affinity @@ -301,7 +297,6 @@ ID: null IGName: master Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master Policies: - anti-affinity @@ -311,7 +306,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 1090f1e092..eb36e964c0 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 @@ -79,7 +79,6 @@ ServerGroup: IGName: bastion Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-bastion Policies: - anti-affinity @@ -156,7 +155,6 @@ ServerGroup: IGName: master Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master Policies: - anti-affinity @@ -220,7 +218,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -317,7 +314,6 @@ ID: null IGName: bastion Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-bastion Policies: - anti-affinity @@ -327,7 +323,6 @@ ID: null IGName: master Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master Policies: - anti-affinity @@ -337,7 +332,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 39172097e9..8f77767e8c 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 @@ -65,7 +65,6 @@ ServerGroup: IGName: master Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master Policies: - anti-affinity @@ -129,7 +128,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -200,7 +198,6 @@ ID: null IGName: master Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master Policies: - anti-affinity @@ -210,7 +207,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 a04c9a5442..000c5d54b4 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -85,7 +85,6 @@ ServerGroup: IGName: master Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-master Policies: - anti-affinity @@ -155,7 +154,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -226,7 +224,6 @@ ID: null IGName: master Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-master Policies: - anti-affinity @@ -236,7 +233,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 88961874a6..eeda9516e3 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 @@ -58,7 +58,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -98,7 +97,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity 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 2a844d6dc7..3080daec92 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 @@ -58,7 +58,6 @@ ServerGroup: IGName: node Lifecycle: Sync MaxSize: 1 - Members: null Name: cluster-node Policies: - anti-affinity @@ -98,7 +97,6 @@ ID: null IGName: node Lifecycle: Sync MaxSize: 1 -Members: null Name: cluster-node Policies: - anti-affinity