From 182f070628d875b8a71f8fcd6263c613d63ed9a2 Mon Sep 17 00:00:00 2001 From: ederst Date: Wed, 16 Jun 2021 12:49:43 +0200 Subject: [PATCH] Adapt tests for Openstack config drive option --- pkg/model/openstackmodel/servergroup_test.go | 57 +++++++++++++++++-- .../adds-additional-security-groups.yaml | 1 + .../adds-cloud-labels-from-ClusterSpec.yaml | 1 + ...s-cloud-labels-from-InstanceGroupSpec.yaml | 1 + ...ithout-bastion-auto-zone-distribution.yaml | 6 ++ ...without-bastion-with-API-loadbalancer.yaml | 6 ++ ...tup-3-masters-3-nodes-without-bastion.yaml | 6 ++ ...sters-3-nodes-without-external-router.yaml | 6 ++ .../one-master-one-node-one-bastion-2.yaml | 3 + .../one-master-one-node-one-bastion.yaml | 3 + ...hout-bastion-no-public-ip-association.yaml | 2 + .../servergroup/one-master-one-node.yaml | 2 + ...subnet-as-availability-zones-fallback.yaml | 1 + ...nce-group-zones-as-availability-zones.yaml | 1 + 14 files changed, 90 insertions(+), 6 deletions(-) diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go index ed92ad3c008b5..9662ce6baae95 100644 --- a/pkg/model/openstackmodel/servergroup_test.go +++ b/pkg/model/openstackmodel/servergroup_test.go @@ -54,6 +54,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Router: &kops.OpenstackRouter{ ExternalNetwork: fi.String("test"), }, + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, }, }, Subnets: []kops.ClusterSubnetSpec{ @@ -108,6 +111,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Router: &kops.OpenstackRouter{ ExternalNetwork: fi.String("test"), }, + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, }, }, Subnets: []kops.ClusterSubnetSpec{ @@ -190,6 +196,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Router: &kops.OpenstackRouter{ ExternalNetwork: fi.String("test"), }, + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, }, }, Subnets: []kops.ClusterSubnetSpec{ @@ -309,6 +318,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Router: &kops.OpenstackRouter{ ExternalNetwork: fi.String("test"), }, + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, }, }, Topology: &kops.TopologySpec{ @@ -429,7 +441,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Spec: kops.ClusterSpec{ MasterPublicName: "master-public-name", CloudConfig: &kops.CloudConfiguration{ - Openstack: &kops.OpenstackConfiguration{}, + Openstack: &kops.OpenstackConfiguration{ + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, + }, }, Subnets: []kops.ClusterSubnetSpec{ { @@ -547,6 +563,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Router: &kops.OpenstackRouter{ ExternalNetwork: fi.String("test"), }, + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, }, }, Subnets: []kops.ClusterSubnetSpec{ @@ -625,6 +644,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Router: &kops.OpenstackRouter{ ExternalNetwork: fi.String("test"), }, + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, }, }, Subnets: []kops.ClusterSubnetSpec{ @@ -681,6 +703,9 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Router: &kops.OpenstackRouter{ ExternalNetwork: fi.String("test"), }, + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, }, }, Subnets: []kops.ClusterSubnetSpec{ @@ -759,7 +784,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Spec: kops.ClusterSpec{ MasterPublicName: "master-public-name", CloudConfig: &kops.CloudConfiguration{ - Openstack: &kops.OpenstackConfiguration{}, + Openstack: &kops.OpenstackConfiguration{ + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, + }, }, Subnets: []kops.ClusterSubnetSpec{ { @@ -798,7 +827,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Spec: kops.ClusterSpec{ MasterPublicName: "master-public-name", CloudConfig: &kops.CloudConfiguration{ - Openstack: &kops.OpenstackConfiguration{}, + Openstack: &kops.OpenstackConfiguration{ + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, + }, }, Subnets: []kops.ClusterSubnetSpec{ { @@ -839,7 +872,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Spec: kops.ClusterSpec{ MasterPublicName: "master-public-name", CloudConfig: &kops.CloudConfiguration{ - Openstack: &kops.OpenstackConfiguration{}, + Openstack: &kops.OpenstackConfiguration{ + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, + }, }, Subnets: []kops.ClusterSubnetSpec{ { @@ -878,7 +915,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Spec: kops.ClusterSpec{ MasterPublicName: "master-public-name", CloudConfig: &kops.CloudConfiguration{ - Openstack: &kops.OpenstackConfiguration{}, + Openstack: &kops.OpenstackConfiguration{ + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, + }, }, Subnets: []kops.ClusterSubnetSpec{ { @@ -917,7 +958,11 @@ func getServerGroupModelBuilderTestInput() []serverGroupModelBuilderTestInput { Spec: kops.ClusterSpec{ MasterPublicName: "master-public-name", CloudConfig: &kops.CloudConfiguration{ - Openstack: &kops.OpenstackConfiguration{}, + Openstack: &kops.OpenstackConfiguration{ + Metadata: &kops.OpenstackMetadata{ + ConfigDrive: fi.Bool(false), + }, + }, }, Subnets: []kops.ClusterSubnetSpec{ { 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 1b735a5cb5193..0861ce7f3b848 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -1,6 +1,7 @@ Name: node --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.2-4 FloatingIP: null ForAPIServer: false 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 d43b7c87252b9..8238a9fbb371b 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 @@ -1,6 +1,7 @@ Name: node --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.2-4 FloatingIP: null ForAPIServer: false 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 d43b7c87252b9..8238a9fbb371b 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 @@ -1,6 +1,7 @@ Name: node --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.2-4 FloatingIP: null ForAPIServer: false 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 503f476ef43ee..f63d9c5eb3a46 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 @@ -45,6 +45,7 @@ Lifecycle: Sync Name: fip-node-3-cluster --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -124,6 +125,7 @@ UserData: Name: master --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -203,6 +205,7 @@ UserData: Name: master --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -282,6 +285,7 @@ UserData: Name: master --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false @@ -354,6 +358,7 @@ UserData: Name: node --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false @@ -426,6 +431,7 @@ UserData: Name: node --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false 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 6483f45ca3cee..dfeb2f977c14c 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 @@ -52,6 +52,7 @@ Lifecycle: Sync Name: fip-node-c-1-cluster --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -119,6 +120,7 @@ UserData: Name: master-a --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -186,6 +188,7 @@ UserData: Name: master-b --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -253,6 +256,7 @@ UserData: Name: master-c --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false @@ -325,6 +329,7 @@ UserData: Name: node-a --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false @@ -397,6 +402,7 @@ UserData: Name: node-b --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false 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 04a16373abc4a..0085226477a68 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 @@ -53,6 +53,7 @@ Lifecycle: Sync Name: fip-node-c-1-cluster --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -132,6 +133,7 @@ UserData: Name: master-a --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -211,6 +213,7 @@ UserData: Name: master-b --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -290,6 +293,7 @@ UserData: Name: master-c --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false @@ -362,6 +366,7 @@ UserData: Name: node-a --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false @@ -434,6 +439,7 @@ UserData: Name: node-b --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false 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 6bc136c0ba346..67f79c4dab8ec 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 @@ -11,6 +11,7 @@ Name: node-b Name: node-c --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -84,6 +85,7 @@ UserData: Name: master-a --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -157,6 +159,7 @@ UserData: Name: master-b --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -230,6 +233,7 @@ UserData: Name: master-c --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -296,6 +300,7 @@ UserData: Name: node-a --- AvailabilityZone: zone-2 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -362,6 +367,7 @@ UserData: Name: node-b --- AvailabilityZone: zone-3 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false 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 df9b83b28a320..b0eb14e4ce959 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 @@ -5,6 +5,7 @@ Name: master Name: node --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -70,6 +71,7 @@ UserData: Name: bastion --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -143,6 +145,7 @@ UserData: Name: master --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false 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 9243e5f87ff35..b40d547d5ec7f 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 @@ -19,6 +19,7 @@ Lifecycle: Sync Name: fip-master-1-cluster --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: false @@ -90,6 +91,7 @@ UserData: Name: bastion --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -169,6 +171,7 @@ UserData: Name: master --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false 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 def407990d8aa..912f3f3b9d16f 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 @@ -3,6 +3,7 @@ Name: master Name: node --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: null ForAPIServer: false @@ -76,6 +77,7 @@ UserData: Name: master --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.2-4 FloatingIP: null ForAPIServer: false 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 18f787f3fdd73..a78ff25791fd4 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -17,6 +17,7 @@ Lifecycle: Sync Name: fip-node-1-cluster --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.1-2 FloatingIP: ForAPIServer: true @@ -96,6 +97,7 @@ UserData: Name: master --- AvailabilityZone: zone-1 +ConfigDrive: false Flavor: blc.2-4 FloatingIP: ForAPIServer: false 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 e3e95e0ae456a..429d3f70510d5 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 @@ -1,6 +1,7 @@ Name: node --- AvailabilityZone: subnet +ConfigDrive: false Flavor: blc.2-4 FloatingIP: null ForAPIServer: false 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 3ec98e2daa89e..b4a94702b9c69 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 @@ -1,6 +1,7 @@ Name: node --- AvailabilityZone: zone-a +ConfigDrive: false Flavor: blc.2-4 FloatingIP: null ForAPIServer: false