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 05e2d689847e3..971c31c293536 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -5,7 +5,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -76,6 +75,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 77d7381487aa0..cdfe1f9dfb6f2 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 @@ -5,7 +5,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -75,6 +74,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 77d7381487aa0..cdfe1f9dfb6f2 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 @@ -5,7 +5,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -75,6 +74,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca diff --git a/pkg/model/openstackmodel/tests/servergroup/configures-allowed-address-pairs-with-annotations.yaml b/pkg/model/openstackmodel/tests/servergroup/configures-allowed-address-pairs-with-annotations.yaml index 8b910cbd7734a..ea7c66c572177 100644 --- a/pkg/model/openstackmodel/tests/servergroup/configures-allowed-address-pairs-with-annotations.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/configures-allowed-address-pairs-with-annotations.yaml @@ -5,7 +5,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -77,6 +76,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 0b28a5479f477..fe45c1ccbe967 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 @@ -5,7 +5,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -74,6 +73,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 fbf9b4ad06f54..3eb318d892b9f 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 @@ -4,59 +4,66 @@ Name: master Lifecycle: "" Name: node --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-1-cluster +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-2-cluster +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-3-cluster +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-1-cluster +WellKnownServices: null --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-2-cluster +WellKnownServices: null --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-3-cluster +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-1-cluster -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master ID: null Image: image @@ -134,18 +141,20 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-2-cluster -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master ID: null Image: image @@ -223,18 +232,20 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-3-cluster -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master ID: null Image: image @@ -312,18 +323,18 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-1-cluster -ForAPIServer: false + WellKnownServices: null GroupName: node ID: null Image: image @@ -392,18 +403,18 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-2-cluster -ForAPIServer: false + WellKnownServices: null GroupName: node ID: null Image: image @@ -472,18 +483,18 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-3-cluster -ForAPIServer: false + WellKnownServices: null GroupName: node ID: null Image: image @@ -552,6 +563,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer-dns-none.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer-dns-none.yaml index af0709574d8df..94f6cdb77e2cc 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer-dns-none.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer-dns-none.yaml @@ -16,7 +16,6 @@ Name: node-b Lifecycle: "" Name: node-c --- -ForAPIServer: true ID: null IP: null LB: @@ -37,12 +36,13 @@ LB: VipSubnet: null Lifecycle: Sync Name: fip-api.cluster +WellKnownServices: +- kube-apiserver --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-a ID: null Image: image @@ -114,12 +114,12 @@ UserData: task: Lifecycle: "" Name: master-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-b ID: null Image: image @@ -191,12 +191,12 @@ UserData: task: Lifecycle: "" Name: master-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-c ID: null Image: image @@ -268,12 +268,12 @@ UserData: task: Lifecycle: "" Name: master-c +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-a ID: null Image: image @@ -342,12 +342,12 @@ UserData: task: Lifecycle: "" Name: node-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-b ID: null Image: image @@ -416,12 +416,12 @@ UserData: task: Lifecycle: "" Name: node-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-c ID: null Image: image @@ -490,6 +490,7 @@ UserData: task: Lifecycle: "" Name: node-c +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 b083d9cb0ba6b..70518f2fb58d2 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 @@ -16,7 +16,6 @@ Name: node-b Lifecycle: "" Name: node-c --- -ForAPIServer: false ID: null IP: null LB: @@ -37,12 +36,13 @@ LB: VipSubnet: null Lifecycle: Sync Name: fip-master-public-name +WellKnownServices: +- kube-apiserver --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-a ID: null Image: image @@ -114,12 +114,12 @@ UserData: task: Lifecycle: "" Name: master-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-b ID: null Image: image @@ -191,12 +191,12 @@ UserData: task: Lifecycle: "" Name: master-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-c ID: null Image: image @@ -268,12 +268,12 @@ UserData: task: Lifecycle: "" Name: master-c +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-a ID: null Image: image @@ -342,12 +342,12 @@ UserData: task: Lifecycle: "" Name: node-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-b ID: null Image: image @@ -416,12 +416,12 @@ UserData: task: Lifecycle: "" Name: node-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-c ID: null Image: image @@ -490,6 +490,7 @@ UserData: task: Lifecycle: "" Name: node-c +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 73480d96a59e8..d78193af64617 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 @@ -16,59 +16,66 @@ Name: node-b Lifecycle: "" Name: node-c --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-a-1-cluster +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-b-1-cluster +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-c-1-cluster +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-a-1-cluster +WellKnownServices: null --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-b-1-cluster +WellKnownServices: null --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-c-1-cluster +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-a-1-cluster -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master-a ID: null Image: image @@ -146,18 +153,20 @@ UserData: task: Lifecycle: "" Name: master-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-b-1-cluster -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master-b ID: null Image: image @@ -235,18 +244,20 @@ UserData: task: Lifecycle: "" Name: master-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-c-1-cluster -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master-c ID: null Image: image @@ -324,18 +335,18 @@ UserData: task: Lifecycle: "" Name: master-c +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-a-1-cluster -ForAPIServer: false + WellKnownServices: null GroupName: node-a ID: null Image: image @@ -404,18 +415,18 @@ UserData: task: Lifecycle: "" Name: node-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-b-1-cluster -ForAPIServer: false + WellKnownServices: null GroupName: node-b ID: null Image: image @@ -484,18 +495,18 @@ UserData: task: Lifecycle: "" Name: node-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-c-1-cluster -ForAPIServer: false + WellKnownServices: null GroupName: node-c ID: null Image: image @@ -564,6 +575,7 @@ UserData: task: Lifecycle: "" Name: node-c +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 d1f01c4be0d93..8141f6e0ccee2 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 @@ -20,7 +20,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-a ID: null Image: image @@ -98,12 +97,12 @@ UserData: task: Lifecycle: "" Name: master-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-b ID: null Image: image @@ -181,12 +180,12 @@ UserData: task: Lifecycle: "" Name: master-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-c ID: null Image: image @@ -264,12 +263,12 @@ UserData: task: Lifecycle: "" Name: master-c +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-a ID: null Image: image @@ -338,12 +337,12 @@ UserData: task: Lifecycle: "" Name: node-a +WellKnownServices: null --- AvailabilityZone: zone-2 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-b ID: null Image: image @@ -412,12 +411,12 @@ UserData: task: Lifecycle: "" Name: node-b +WellKnownServices: null --- AvailabilityZone: zone-3 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-c ID: null Image: image @@ -486,6 +485,7 @@ UserData: task: Lifecycle: "" Name: node-c +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 d34173669faff..f74ab3ed16b18 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,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: bastion ID: null Image: image @@ -78,12 +77,12 @@ UserData: task: Lifecycle: "" Name: bastion +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master ID: null Image: image @@ -161,12 +160,12 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image @@ -235,6 +234,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 854f11c4127df..71e207ec5ca2a 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 @@ -7,24 +7,23 @@ Name: master Lifecycle: "" Name: node --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-bastion-1-cluster +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-bastion-1-cluster -ForAPIServer: false + WellKnownServices: null GroupName: bastion ID: null Image: image @@ -91,12 +90,12 @@ UserData: task: Lifecycle: "" Name: bastion +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master ID: null Image: image @@ -174,12 +173,12 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image @@ -248,6 +247,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 b7f9bb295f6c7..85a1b6aad04fa 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 @@ -8,7 +8,6 @@ AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master ID: null Image: image-master @@ -86,12 +85,12 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -160,6 +159,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 f073e0480b57d..c99a5acf8151a 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -4,31 +4,34 @@ Name: master Lifecycle: "" Name: node --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-1-cluster +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-1-cluster +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-1-cluster -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master ID: null Image: image-master @@ -106,18 +109,18 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-1-cluster -ForAPIServer: false + WellKnownServices: null GroupName: node ID: null Image: image-node @@ -186,6 +189,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca diff --git a/pkg/model/openstackmodel/tests/servergroup/single-zone-setup-3-masters-1-node-without-bastion-with-API-loadbalancer-dns-none.yaml b/pkg/model/openstackmodel/tests/servergroup/single-zone-setup-3-masters-1-node-without-bastion-with-API-loadbalancer-dns-none.yaml index 71a8179985648..e66b03ffb7f62 100644 --- a/pkg/model/openstackmodel/tests/servergroup/single-zone-setup-3-masters-1-node-without-bastion-with-API-loadbalancer-dns-none.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/single-zone-setup-3-masters-1-node-without-bastion-with-API-loadbalancer-dns-none.yaml @@ -10,7 +10,6 @@ Name: master-c Lifecycle: "" Name: node-a --- -ForAPIServer: true ID: null IP: null LB: @@ -31,12 +30,13 @@ LB: VipSubnet: null Lifecycle: Sync Name: fip-api.cluster +WellKnownServices: +- kube-apiserver --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-a ID: null Image: image @@ -110,12 +110,12 @@ UserData: task: Lifecycle: "" Name: master-a +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-b ID: null Image: image @@ -189,12 +189,12 @@ UserData: task: Lifecycle: "" Name: master-b +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: master-c ID: null Image: image @@ -268,12 +268,12 @@ UserData: task: Lifecycle: "" Name: master-c +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: null -ForAPIServer: false GroupName: node-a ID: null Image: image @@ -342,6 +342,7 @@ UserData: task: Lifecycle: "" Name: node-a +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca diff --git a/pkg/model/openstackmodel/tests/servergroup/truncate-cluster-names-to-42-characters.yaml b/pkg/model/openstackmodel/tests/servergroup/truncate-cluster-names-to-42-characters.yaml index 28f978a5af828..df9071e567f7a 100644 --- a/pkg/model/openstackmodel/tests/servergroup/truncate-cluster-names-to-42-characters.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/truncate-cluster-names-to-42-characters.yaml @@ -4,31 +4,34 @@ Name: master Lifecycle: "" Name: node --- -ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-1-tom-software-dev-playground-real33-k8s-local +WellKnownServices: +- kube-apiserver +- kops-controller --- -ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-1-tom-software-dev-playground-real33-k8s-local +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.1-2 FloatingIP: - ForAPIServer: true ID: null IP: null LB: null Lifecycle: Sync Name: fip-master-1-tom-software-dev-playground-real33-k8s-local -ForAPIServer: false + WellKnownServices: + - kube-apiserver + - kops-controller GroupName: master ID: null Image: image-master @@ -106,18 +109,18 @@ UserData: task: Lifecycle: "" Name: master +WellKnownServices: null --- AvailabilityZone: zone-1 ConfigDrive: false Flavor: blc.2-4 FloatingIP: - ForAPIServer: false ID: null IP: null LB: null Lifecycle: Sync Name: fip-node-1-tom-software-dev-playground-real33-k8s-local -ForAPIServer: false + WellKnownServices: null GroupName: node ID: null Image: image-node @@ -186,6 +189,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 6fb6f47de6cc3..2312d6ca8ef45 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 @@ -5,7 +5,6 @@ AvailabilityZone: subnet ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -76,6 +75,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca 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 1483d5ebd4713..4201c373570e5 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 @@ -5,7 +5,6 @@ AvailabilityZone: zone-a ConfigDrive: false Flavor: blc.2-4 FloatingIP: null -ForAPIServer: false GroupName: node ID: null Image: image-node @@ -76,6 +75,7 @@ UserData: task: Lifecycle: "" Name: node +WellKnownServices: null --- Lifecycle: "" Name: apiserver-aggregator-ca