diff --git a/pkg/asset/machines/libvirt/machines.go b/pkg/asset/machines/libvirt/machines.go index 066e515a2ff..5911dcc8f53 100644 --- a/pkg/asset/machines/libvirt/machines.go +++ b/pkg/asset/machines/libvirt/machines.go @@ -33,7 +33,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine for idx := int64(0); idx < total; idx++ { machine := machineapi.Machine{ TypeMeta: metav1.TypeMeta{ - APIVersion: "cluster.k8s.io/v1alpha1", + APIVersion: "machine.openshift.io/v1beta1", Kind: "Machine", }, ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/asset/machines/libvirt/machinesets.go b/pkg/asset/machines/libvirt/machinesets.go index aaf594da5f8..006f9829aa4 100644 --- a/pkg/asset/machines/libvirt/machinesets.go +++ b/pkg/asset/machines/libvirt/machinesets.go @@ -36,7 +36,7 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach name := fmt.Sprintf("%s-%s-%d", clustername, pool.Name, 0) mset := &machineapi.MachineSet{ TypeMeta: metav1.TypeMeta{ - APIVersion: "cluster.k8s.io/v1alpha1", + APIVersion: "machine.openshift.io/v1beta1", Kind: "MachineSet", }, ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/asset/manifests/cluster_k8s_io.go b/pkg/asset/manifests/cluster_k8s_io.go index 3421c42dfa9..f144b3f4048 100644 --- a/pkg/asset/manifests/cluster_k8s_io.go +++ b/pkg/asset/manifests/cluster_k8s_io.go @@ -13,7 +13,7 @@ import ( // This file was originally in pkg/assets/machines, but is now in // /manifests due to an import loop. -// ClusterK8sIO generates the `Cluster.cluster.k8s.io/v1alpha1` object. +// ClusterK8sIO generates the `Cluster.machine.openshift.io/v1beta1` object. type ClusterK8sIO struct { Raw []byte } @@ -22,7 +22,7 @@ var _ asset.Asset = (*ClusterK8sIO)(nil) // Name returns a human friendly name for the ClusterK8sIO Asset. func (c *ClusterK8sIO) Name() string { - return "Cluster.cluster.k8s.io/v1alpha1" + return "Cluster.machine.openshift.io/v1beta1" } // Dependencies returns all of the dependencies directly needed by the @@ -48,7 +48,7 @@ func (c *ClusterK8sIO) Generate(dependencies asset.Parents) error { cluster := clusterv1a1.Cluster{ TypeMeta: metav1.TypeMeta{ - APIVersion: "cluster.k8s.io/v1alpha1", + APIVersion: "machine.openshift.io/v1beta1", Kind: "Cluster", }, ObjectMeta: metav1.ObjectMeta{