From 672481af7df42ae9f2caa716626c76904d35c83c Mon Sep 17 00:00:00 2001 From: Enxebre Date: Thu, 31 Jan 2019 17:24:12 +0100 Subject: [PATCH] Changes for cluster-api-actuator-pkg to support machine.openshift.io --- .../pkg/e2e/framework/clusterapi.go | 2 +- .../pkg/e2e/framework/clusters.go | 8 +-- .../pkg/e2e/framework/framework.go | 2 +- .../pkg/e2e/framework/machines.go | 46 +++++++-------- .../pkg/manifests/manifests.go | 56 +++++++++---------- .../pkg/types/types.go | 8 +-- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go index 6b02fde547..5e048feb7a 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go @@ -73,7 +73,7 @@ func (f *Framework) DeployClusterAPIStack(clusterAPINamespace, actuatorPrivateKe f.By("Waiting until cluster objects can be listed") err = wait.Poll(PollInterval, PoolClusterAPIDeploymentTimeout, func() (bool, error) { // Any namespace will do just to that one can list cluster objects - _, err := f.CAPIClient.ClusterV1alpha1().Clusters("default").List(metav1.ListOptions{}) + _, err := f.CAPIClient.MachineV1beta1().Clusters("default").List(metav1.ListOptions{}) if err != nil { glog.V(2).Infof("unable to list clusters: %v", err) return false, nil diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusters.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusters.go index 5c54fd5554..ce9fbbeaf9 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusters.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusters.go @@ -7,13 +7,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1" + machine1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1" ) -func (f *Framework) CreateClusterAndWait(cluster *clusterv1alpha1.Cluster) { +func (f *Framework) CreateClusterAndWait(cluster *machine1beta1.Cluster) { f.By(fmt.Sprintf("Creating %q cluster", cluster.Name)) err := wait.Poll(PollInterval, PoolTimeout, func() (bool, error) { - _, err := f.CAPIClient.ClusterV1alpha1().Clusters(cluster.Namespace).Create(cluster) + _, err := f.CAPIClient.MachineV1beta1().Clusters(cluster.Namespace).Create(cluster) if err != nil { glog.V(2).Infof("error creating cluster: %v", err) return false, nil @@ -23,7 +23,7 @@ func (f *Framework) CreateClusterAndWait(cluster *clusterv1alpha1.Cluster) { f.ErrNotExpected(err) err = wait.Poll(PollInterval, PoolTimeout, func() (bool, error) { - _, err := f.CAPIClient.ClusterV1alpha1().Clusters(cluster.Namespace).Get(cluster.Name, metav1.GetOptions{}) + _, err := f.CAPIClient.MachineV1beta1().Clusters(cluster.Namespace).Get(cluster.Name, metav1.GetOptions{}) if err != nil { return false, nil } diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go index 12476c8a9f..22d79f076f 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go @@ -18,7 +18,7 @@ import ( "k8s.io/client-go/rest" // apiregistrationclientset "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" - "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset" + "github.com/openshift/cluster-api/pkg/client/clientset_generated/clientset" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/machines.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/machines.go index 3a24599e08..caccb0d679 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/machines.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/machines.go @@ -14,18 +14,18 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1" + machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1" ) -func (f *Framework) DeleteMachineAndWait(machine *clusterv1alpha1.Machine, client types.CloudProviderClient) { +func (f *Framework) DeleteMachineAndWait(machine *machinev1beta1.Machine, client types.CloudProviderClient) { f.By(fmt.Sprintf("Deleting %q machine", machine.Name)) - err := f.CAPIClient.ClusterV1alpha1().Machines(machine.Namespace).Delete(machine.Name, &metav1.DeleteOptions{}) + err := f.CAPIClient.MachineV1beta1().Machines(machine.Namespace).Delete(machine.Name, &metav1.DeleteOptions{}) f.IgnoreNotFoundErr(err) // Verify the testing machine has been destroyed f.By("Verify instance is terminated") err = wait.Poll(PollInterval, PoolTimeout, func() (bool, error) { - _, err := f.CAPIClient.ClusterV1alpha1().Machines(machine.Namespace).Get(machine.Name, metav1.GetOptions{}) + _, err := f.CAPIClient.MachineV1beta1().Machines(machine.Namespace).Get(machine.Name, metav1.GetOptions{}) if err == nil { glog.V(2).Info("Waiting for machine to be deleted") return false, nil @@ -55,11 +55,11 @@ func (f *Framework) DeleteMachineAndWait(machine *clusterv1alpha1.Machine, clien } } -func (f *Framework) waitForMachineToRun(machine *clusterv1alpha1.Machine, client types.CloudProviderClient) { +func (f *Framework) waitForMachineToRun(machine *machinev1beta1.Machine, client types.CloudProviderClient) { f.By(fmt.Sprintf("Waiting for %q machine", machine.Name)) // Verify machine has been deployed err := wait.Poll(PollInterval, TimeoutPoolMachineRunningInterval, func() (bool, error) { - if _, err := f.CAPIClient.ClusterV1alpha1().Machines(machine.Namespace).Get(machine.Name, metav1.GetOptions{}); err != nil { + if _, err := f.CAPIClient.MachineV1beta1().Machines(machine.Namespace).Get(machine.Name, metav1.GetOptions{}); err != nil { glog.V(2).Infof("Waiting for '%v/%v' machine to be created", machine.Namespace, machine.Name) return false, nil } @@ -88,7 +88,7 @@ func (f *Framework) waitForMachineToRun(machine *clusterv1alpha1.Machine, client f.ErrNotExpected(err) } -func (f *Framework) waitForMachineToTerminate(machine *clusterv1alpha1.Machine, client types.CloudProviderClient) error { +func (f *Framework) waitForMachineToTerminate(machine *machinev1beta1.Machine, client types.CloudProviderClient) error { f.By("Verify machine's underlying instance is not running") err := wait.Poll(PollInterval, PoolTimeout, func() (bool, error) { glog.V(2).Info("Waiting for instance to terminate") @@ -112,7 +112,7 @@ func (f *Framework) waitForMachineToTerminate(machine *clusterv1alpha1.Machine, f.By(fmt.Sprintf("Waiting for %q machine object to be deleted", machine.Name)) // Verify machine has been deployed err = wait.Poll(PollInterval, TimeoutPoolMachineRunningInterval, func() (bool, error) { - if _, err := f.CAPIClient.ClusterV1alpha1().Machines(machine.Namespace).Get(machine.Name, metav1.GetOptions{}); err != nil { + if _, err := f.CAPIClient.MachineV1beta1().Machines(machine.Namespace).Get(machine.Name, metav1.GetOptions{}); err != nil { glog.V(2).Infof("err: %v", err) return true, nil } @@ -125,10 +125,10 @@ func (f *Framework) waitForMachineToTerminate(machine *clusterv1alpha1.Machine, return nil } -func (f *Framework) CreateMachineAndWait(machine *clusterv1alpha1.Machine, client types.CloudProviderClient) { +func (f *Framework) CreateMachineAndWait(machine *machinev1beta1.Machine, client types.CloudProviderClient) { f.By(fmt.Sprintf("Creating %q machine", machine.Name)) err := wait.Poll(PollInterval, PoolTimeout, func() (bool, error) { - _, err := f.CAPIClient.ClusterV1alpha1().Machines(machine.Namespace).Create(machine) + _, err := f.CAPIClient.MachineV1beta1().Machines(machine.Namespace).Create(machine) if err != nil { glog.V(2).Infof("can't create machine: %v", err) return false, nil @@ -140,10 +140,10 @@ func (f *Framework) CreateMachineAndWait(machine *clusterv1alpha1.Machine, clien f.waitForMachineToRun(machine, client) } -func (f *Framework) CreateMachineSetAndWait(machineset *clusterv1alpha1.MachineSet, client types.CloudProviderClient) { +func (f *Framework) CreateMachineSetAndWait(machineset *machinev1beta1.MachineSet, client types.CloudProviderClient) { f.By(fmt.Sprintf("Creating %q machineset", machineset.Name)) err := wait.Poll(PollInterval, PoolTimeout, func() (bool, error) { - _, err := f.CAPIClient.ClusterV1alpha1().MachineSets(machineset.Namespace).Create(machineset) + _, err := f.CAPIClient.MachineV1beta1().MachineSets(machineset.Namespace).Create(machineset) if err != nil { glog.V(2).Infof("can't create machineset: %v", err) return false, nil @@ -154,7 +154,7 @@ func (f *Framework) CreateMachineSetAndWait(machineset *clusterv1alpha1.MachineS // Verify machineset has been deployed err = wait.Poll(PollInterval, TimeoutPoolMachineRunningInterval, func() (bool, error) { - if _, err := f.CAPIClient.ClusterV1alpha1().MachineSets(machineset.Namespace).Get(machineset.Name, metav1.GetOptions{}); err != nil { + if _, err := f.CAPIClient.MachineV1beta1().MachineSets(machineset.Namespace).Get(machineset.Name, metav1.GetOptions{}); err != nil { glog.V(2).Infof("Waiting for machineset to be created: %v", err) return false, nil } @@ -163,7 +163,7 @@ func (f *Framework) CreateMachineSetAndWait(machineset *clusterv1alpha1.MachineS f.ErrNotExpected(err) f.By("Verify machineset's underlying instances is running") - machines, err := f.CAPIClient.ClusterV1alpha1().Machines(machineset.Namespace).List(metav1.ListOptions{ + machines, err := f.CAPIClient.MachineV1beta1().Machines(machineset.Namespace).List(metav1.ListOptions{ LabelSelector: labels.SelectorFromSet(machineset.Spec.Selector.MatchLabels).String(), }) f.ErrNotExpected(err) @@ -173,9 +173,9 @@ func (f *Framework) CreateMachineSetAndWait(machineset *clusterv1alpha1.MachineS } } -func (f *Framework) DeleteMachineSetAndWait(machineset *clusterv1alpha1.MachineSet, client types.CloudProviderClient) error { +func (f *Framework) DeleteMachineSetAndWait(machineset *machinev1beta1.MachineSet, client types.CloudProviderClient) error { f.By(fmt.Sprintf("Get all %q machineset's machines", machineset.Name)) - machines, err := f.CAPIClient.ClusterV1alpha1().Machines(machineset.Namespace).List(metav1.ListOptions{ + machines, err := f.CAPIClient.MachineV1beta1().Machines(machineset.Namespace).List(metav1.ListOptions{ LabelSelector: labels.SelectorFromSet(machineset.Spec.Selector.MatchLabels).String(), }) if err != nil { @@ -183,7 +183,7 @@ func (f *Framework) DeleteMachineSetAndWait(machineset *clusterv1alpha1.MachineS } f.By(fmt.Sprintf("Deleting %q machineset", machineset.Name)) - err = f.CAPIClient.ClusterV1alpha1().MachineSets(machineset.Namespace).Delete(machineset.Name, &metav1.DeleteOptions{}) + err = f.CAPIClient.MachineV1beta1().MachineSets(machineset.Namespace).Delete(machineset.Name, &metav1.DeleteOptions{}) if err != nil { return err } @@ -195,7 +195,7 @@ func (f *Framework) DeleteMachineSetAndWait(machineset *clusterv1alpha1.MachineS } err = wait.Poll(PollInterval, PoolTimeout, func() (bool, error) { - _, err := f.CAPIClient.ClusterV1alpha1().MachineSets(machineset.Namespace).Get(machineset.Name, metav1.GetOptions{}) + _, err := f.CAPIClient.MachineV1beta1().MachineSets(machineset.Namespace).Get(machineset.Name, metav1.GetOptions{}) if err != nil { if strings.Contains(err.Error(), "not found") { return true, nil @@ -264,7 +264,7 @@ func ReadKubeconfigFromServer(sshConfig *SSHConfig) (string, error) { return b.String(), nil } -func (f *Framework) GetMasterMachineRestConfig(masterMachine *clusterv1alpha1.Machine, client types.CloudProviderClient) (*rest.Config, error) { +func (f *Framework) GetMasterMachineRestConfig(masterMachine *machinev1beta1.Machine, client types.CloudProviderClient) (*rest.Config, error) { var masterPublicDNSName string err := wait.Poll(PollInterval, TimeoutPoolMachineRunningInterval, func() (bool, error) { var err error @@ -312,13 +312,13 @@ func (f *Framework) GetMasterMachineRestConfig(masterMachine *clusterv1alpha1.Ma } type machineToDelete struct { - machine *clusterv1alpha1.Machine + machine *machinev1beta1.Machine framework *Framework client types.CloudProviderClient } type machinesetToDelete struct { - machineset *clusterv1alpha1.MachineSet + machineset *machinev1beta1.MachineSet framework *Framework client types.CloudProviderClient } @@ -335,11 +335,11 @@ func InitMachinesToDelete() *MachinesToDelete { } } -func (m *MachinesToDelete) AddMachine(machine *clusterv1alpha1.Machine, framework *Framework, client types.CloudProviderClient) { +func (m *MachinesToDelete) AddMachine(machine *machinev1beta1.Machine, framework *Framework, client types.CloudProviderClient) { m.machines = append([]machineToDelete{{machine: machine, framework: framework, client: client}}, m.machines...) } -func (m *MachinesToDelete) AddMachineSet(machineset *clusterv1alpha1.MachineSet, framework *Framework, client types.CloudProviderClient) { +func (m *MachinesToDelete) AddMachineSet(machineset *machinev1beta1.MachineSet, framework *Framework, client types.CloudProviderClient) { m.machinesets = append([]machinesetToDelete{{machineset: machineset, framework: framework, client: client}}, m.machinesets...) } diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go index 24297491be..d0ab481020 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" // apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" - clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1" + Machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1" ) func ClusterCRDManifest() *v1beta1.CustomResourceDefinition { @@ -23,14 +23,14 @@ func ClusterCRDManifest() *v1beta1.CustomResourceDefinition { APIVersion: "apiextensions.k8s.io/v1beta1", }, ObjectMeta: metav1.ObjectMeta{ - Name: "clusters.cluster.k8s.io", + Name: "clusters.machine.openshift.io", Labels: map[string]string{ "controller-tools.k8s.io": "1.0", }, }, Spec: v1beta1.CustomResourceDefinitionSpec{ - Group: "cluster.k8s.io", - Version: "v1alpha1", + Group: "machine.openshift.io", + Version: "v1beta1", Names: v1beta1.CustomResourceDefinitionNames{ Plural: "clusters", Kind: "Cluster", @@ -164,14 +164,14 @@ func MachineCRDManifest() *v1beta1.CustomResourceDefinition { APIVersion: "apiextensions.k8s.io/v1beta1", }, ObjectMeta: metav1.ObjectMeta{ - Name: "machines.cluster.k8s.io", + Name: "machines.machine.openshift.io", Labels: map[string]string{ "controller-tools.k8s.io": "1.0", }, }, Spec: v1beta1.CustomResourceDefinitionSpec{ - Group: "cluster.k8s.io", - Version: "v1alpha1", + Group: "machine.openshift.io", + Version: "v1beta1", Names: v1beta1.CustomResourceDefinitionNames{ Plural: "machines", Kind: "Machine", @@ -304,14 +304,14 @@ func MachineSetCRDManifest() *v1beta1.CustomResourceDefinition { APIVersion: "apiextensions.k8s.io/v1beta1", }, ObjectMeta: metav1.ObjectMeta{ - Name: "machinesets.cluster.k8s.io", + Name: "machinesets.machine.openshift.io", Labels: map[string]string{ "controller-tools.k8s.io": "1.0", }, }, Spec: v1beta1.CustomResourceDefinitionSpec{ - Group: "cluster.k8s.io", - Version: "v1alpha1", + Group: "machine.openshift.io", + Version: "v1beta1", Names: v1beta1.CustomResourceDefinitionNames{ Plural: "machinesets", Kind: "MachineSet", @@ -454,14 +454,14 @@ func MachineDeploymentCRDManifest() *v1beta1.CustomResourceDefinition { APIVersion: "apiextensions.k8s.io/v1beta1", }, ObjectMeta: metav1.ObjectMeta{ - Name: "machinedeployments.cluster.k8s.io", + Name: "machinedeployments.machine.openshift.io", Labels: map[string]string{ "controller-tools.k8s.io": "1.0", }, }, Spec: v1beta1.CustomResourceDefinitionSpec{ - Group: "cluster.k8s.io", - Version: "v1alpha1", + Group: "machine.openshift.io", + Version: "v1beta1", Names: v1beta1.CustomResourceDefinitionNames{ Plural: "machinedeployments", Kind: "MachineDeployment", @@ -644,7 +644,7 @@ func ClusterRoleManifest() *rbacv1.ClusterRole { "delete", }, APIGroups: []string{ - "cluster.k8s.io", + "machine.openshift.io", }, Resources: []string{ "clusters", @@ -902,9 +902,9 @@ func ClusterAPIControllersDeployment(clusterAPINamespace, machineControllerImage return deployment } -func TestingMachine(clusterID string, namespace string, providerSpec clusterv1alpha1.ProviderSpec) *clusterv1alpha1.Machine { +func TestingMachine(clusterID string, namespace string, providerSpec Machinev1beta1.ProviderSpec) *Machinev1beta1.Machine { randomUUID := string(uuid.NewUUID()) - machine := &clusterv1alpha1.Machine{ + machine := &Machinev1beta1.Machine{ ObjectMeta: metav1.ObjectMeta{ Name: clusterID + "-machine-" + randomUUID[:6], Namespace: namespace, @@ -913,14 +913,14 @@ func TestingMachine(clusterID string, namespace string, providerSpec clusterv1al "sigs.k8s.io/cluster-api-cluster": clusterID, }, }, - Spec: clusterv1alpha1.MachineSpec{ + Spec: Machinev1beta1.MachineSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ "node-role.kubernetes.io/compute": "", }, }, ProviderSpec: providerSpec, - Versions: clusterv1alpha1.MachineVersionInfo{ + Versions: Machinev1beta1.MachineVersionInfo{ Kubelet: "1.10.1", ControlPlane: "1.10.1", }, @@ -930,9 +930,9 @@ func TestingMachine(clusterID string, namespace string, providerSpec clusterv1al return machine } -func MasterMachine(clusterID, namespace string, providerSpec clusterv1alpha1.ProviderSpec) *clusterv1alpha1.Machine { +func MasterMachine(clusterID, namespace string, providerSpec Machinev1beta1.ProviderSpec) *Machinev1beta1.Machine { randomUUID := string(uuid.NewUUID()) - machine := &clusterv1alpha1.Machine{ + machine := &Machinev1beta1.Machine{ ObjectMeta: metav1.ObjectMeta{ Name: clusterID + "-master-machine-" + randomUUID[:6], Namespace: namespace, @@ -941,9 +941,9 @@ func MasterMachine(clusterID, namespace string, providerSpec clusterv1alpha1.Pro "sigs.k8s.io/cluster-api-cluster": clusterID, }, }, - Spec: clusterv1alpha1.MachineSpec{ + Spec: Machinev1beta1.MachineSpec{ ProviderSpec: providerSpec, - Versions: clusterv1alpha1.MachineVersionInfo{ + Versions: Machinev1beta1.MachineVersionInfo{ Kubelet: "1.10.1", ControlPlane: "1.10.1", }, @@ -1003,10 +1003,10 @@ func WorkerMachineUserDataSecret(secretName, namespace, masterIP string) (*apiv1 }, nil } -func WorkerMachineSet(clusterID, namespace string, providerSpec clusterv1alpha1.ProviderSpec) *clusterv1alpha1.MachineSet { +func WorkerMachineSet(clusterID, namespace string, providerSpec Machinev1beta1.ProviderSpec) *Machinev1beta1.MachineSet { var replicas int32 = 1 randomUUID := string(uuid.NewUUID()) - return &clusterv1alpha1.MachineSet{ + return &Machinev1beta1.MachineSet{ ObjectMeta: metav1.ObjectMeta{ Name: clusterID + "-worker-machineset-" + randomUUID[:6], Namespace: namespace, @@ -1015,7 +1015,7 @@ func WorkerMachineSet(clusterID, namespace string, providerSpec clusterv1alpha1. "sigs.k8s.io/cluster-api-cluster": clusterID, }, }, - Spec: clusterv1alpha1.MachineSetSpec{ + Spec: Machinev1beta1.MachineSetSpec{ Selector: metav1.LabelSelector{ MatchLabels: map[string]string{ "sigs.k8s.io/cluster-api-machineset": clusterID + "-worker-machineset-" + randomUUID[:6], @@ -1023,7 +1023,7 @@ func WorkerMachineSet(clusterID, namespace string, providerSpec clusterv1alpha1. }, }, Replicas: &replicas, - Template: clusterv1alpha1.MachineTemplateSpec{ + Template: Machinev1beta1.MachineTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ GenerateName: clusterID + "-worker-machine-" + randomUUID[:6] + "-", Labels: map[string]string{ @@ -1031,14 +1031,14 @@ func WorkerMachineSet(clusterID, namespace string, providerSpec clusterv1alpha1. "sigs.k8s.io/cluster-api-cluster": clusterID, }, }, - Spec: clusterv1alpha1.MachineSpec{ + Spec: Machinev1beta1.MachineSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ "node-role.kubernetes.io/compute": "", }, }, ProviderSpec: providerSpec, - Versions: clusterv1alpha1.MachineVersionInfo{ + Versions: Machinev1beta1.MachineVersionInfo{ Kubelet: "1.10.1", ControlPlane: "1.10.1", }, diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/types/types.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/types/types.go index b826b2f254..39458f2194 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/types/types.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/types/types.go @@ -1,13 +1,13 @@ package types -import clusterv1alpha1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1" +import machinev1beta1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1" // CloudProviderClient interface to generalize queries over various cloud providers type CloudProviderClient interface { // Get running instances (of a given cloud provider) managed by the machine object - GetRunningInstances(machine *clusterv1alpha1.Machine) ([]interface{}, error) + GetRunningInstances(machine *machinev1beta1.Machine) ([]interface{}, error) // Get running instance public DNS name - GetPublicDNSName(machine *clusterv1alpha1.Machine) (string, error) + GetPublicDNSName(machine *machinev1beta1.Machine) (string, error) // Get private IP - GetPrivateIP(machine *clusterv1alpha1.Machine) (string, error) + GetPrivateIP(machine *machinev1beta1.Machine) (string, error) }