diff --git a/README.md b/README.md index eda7363a3a..1d072cd24a 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,6 @@ The Machine API Operator (MAO) deploys and manages platform-specific machine con - [machine-api-provider-azure](https://github.com/openshift/machine-api-provider-azure) - - [cluster-api-provider-libvirt](https://github.com/openshift/cluster-api-provider-libvirt) - - [cluster-api-provider-openstack](https://github.com/openshift/cluster-api-provider-openstack) - [cluster-api-provider-baremetal](https://github.com/openshift/cluster-api-provider-baremetal) diff --git a/docs/dev/hacking-guide.md b/docs/dev/hacking-guide.md index 2a0940db9b..07c751c8b1 100644 --- a/docs/dev/hacking-guide.md +++ b/docs/dev/hacking-guide.md @@ -149,7 +149,6 @@ data: "machineAPIOperator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...", "clusterAPIControllerAWS": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...", "clusterAPIControllerOpenStack": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...", - "clusterAPIControllerLibvirt": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...", "clusterAPIControllerBareMetal": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...", "clusterAPIControllerAzure": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...", "clusterAPIControllerGCP": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...", diff --git a/install/0000_30_machine-api-operator_01_images.configmap.yaml b/install/0000_30_machine-api-operator_01_images.configmap.yaml index b26bd9638f..7bdf4fae01 100644 --- a/install/0000_30_machine-api-operator_01_images.configmap.yaml +++ b/install/0000_30_machine-api-operator_01_images.configmap.yaml @@ -16,7 +16,6 @@ data: "kubeRBACProxy": "quay.io/openshift/origin-kube-rbac-proxy", "clusterAPIControllerAWS": "quay.io/openshift/origin-aws-machine-controllers", "clusterAPIControllerOpenStack": "quay.io/openshift/origin-openstack-machine-api-provider", - "clusterAPIControllerLibvirt": "quay.io/openshift/origin-libvirt-machine-controllers", "clusterAPIControllerBareMetal": "quay.io/openshift/origin-baremetal-machine-controllers", "clusterAPIControllerAzure": "quay.io/openshift/origin-azure-machine-controllers", "clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers", diff --git a/install/image-references b/install/image-references index f2250020a1..84be04d6d9 100644 --- a/install/image-references +++ b/install/image-references @@ -14,10 +14,6 @@ spec: from: kind: DockerImage name: quay.io/openshift/origin-openstack-machine-api-provider - - name: libvirt-machine-controllers - from: - kind: DockerImage - name: quay.io/openshift/origin-libvirt-machine-controllers - name: baremetal-machine-controllers from: kind: DockerImage diff --git a/pkg/operator/config.go b/pkg/operator/config.go index 953eccd33e..4732def8d6 100644 --- a/pkg/operator/config.go +++ b/pkg/operator/config.go @@ -41,7 +41,6 @@ type Images struct { MachineAPIOperator string `json:"machineAPIOperator"` ClusterAPIControllerAWS string `json:"clusterAPIControllerAWS"` ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"` - ClusterAPIControllerLibvirt string `json:"clusterAPIControllerLibvirt"` ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"` ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"` ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"` @@ -78,8 +77,6 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag switch platform { case configv1.AWSPlatformType: return images.ClusterAPIControllerAWS, nil - case configv1.LibvirtPlatformType: - return images.ClusterAPIControllerLibvirt, nil case configv1.OpenStackPlatformType: return images.ClusterAPIControllerOpenStack, nil case configv1.AzurePlatformType: diff --git a/pkg/operator/config_test.go b/pkg/operator/config_test.go index 9d5802b0e5..441903b12f 100644 --- a/pkg/operator/config_test.go +++ b/pkg/operator/config_test.go @@ -19,7 +19,6 @@ const ( expectedAzureImage = "quay.io/openshift/origin-azure-machine-controllers" expectedBareMetalImage = "quay.io/openshift/origin-baremetal-machine-controllers" expectedGCPImage = "quay.io/openshift/origin-gcp-machine-controllers" - expectedLibvirtImage = "quay.io/openshift/origin-libvirt-machine-controllers" expectedOpenstackImage = "quay.io/openshift/origin-openstack-machine-api-provider" expectedPowerVSImage = "quay.io/openshift/origin-powervs-machine-controllers" expectedVSphereImage = "quay.io/openshift/origin-machine-api-operator" @@ -92,15 +91,6 @@ func TestGetProviderFromInfrastructure(t *testing.T) { }, }, expected: configv1.AWSPlatformType, - }, { - infra: &configv1.Infrastructure{ - Status: configv1.InfrastructureStatus{ - PlatformStatus: &configv1.PlatformStatus{ - Type: configv1.LibvirtPlatformType, - }, - }, - }, - expected: configv1.LibvirtPlatformType, }, { infra: &configv1.Infrastructure{ Status: configv1.InfrastructureStatus{ @@ -214,9 +204,6 @@ func TestGetImagesFromJSONFile(t *testing.T) { if img.ClusterAPIControllerAWS != expectedAWSImage { t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedAWSImage, img.ClusterAPIControllerAWS) } - if img.ClusterAPIControllerLibvirt != expectedLibvirtImage { - t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedLibvirtImage, img.ClusterAPIControllerLibvirt) - } if img.ClusterAPIControllerOpenStack != expectedOpenstackImage { t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOpenstackImage, img.ClusterAPIControllerOpenStack) } @@ -251,10 +238,6 @@ func TestGetProviderControllerFromImages(t *testing.T) { provider: configv1.AWSPlatformType, expectedImage: expectedAWSImage, }, - { - provider: configv1.LibvirtPlatformType, - expectedImage: expectedLibvirtImage, - }, { provider: configv1.OpenStackPlatformType, expectedImage: expectedOpenstackImage, @@ -332,10 +315,6 @@ func TestGetTerminationHandlerFromImages(t *testing.T) { provider: configv1.AWSPlatformType, expectedImage: expectedAWSImage, }, - { - provider: configv1.LibvirtPlatformType, - expectedImage: clusterAPIControllerNoOp, - }, { provider: configv1.OpenStackPlatformType, expectedImage: clusterAPIControllerNoOp, diff --git a/pkg/operator/operator_test.go b/pkg/operator/operator_test.go index 8188a8999a..4acc7a16a6 100644 --- a/pkg/operator/operator_test.go +++ b/pkg/operator/operator_test.go @@ -144,10 +144,6 @@ func TestOperatorSync_NoOp(t *testing.T) { platform: openshiftv1.AWSPlatformType, expectedNoop: false, }, - { - platform: openshiftv1.LibvirtPlatformType, - expectedNoop: false, - }, { platform: openshiftv1.OpenStackPlatformType, expectedNoop: false, @@ -398,40 +394,6 @@ func TestMAOConfigFromInfrastructure(t *testing.T) { Features: enabledFeatureMap, }, }, - { - name: string(openshiftv1.LibvirtPlatformType), - platform: openshiftv1.LibvirtPlatformType, - infra: infra, - featureGate: &openshiftv1.FeatureGate{ - ObjectMeta: metav1.ObjectMeta{ - Name: "cluster", - }, - Status: openshiftv1.FeatureGateStatus{ - FeatureGates: []openshiftv1.FeatureGateDetails{ - { - Version: "", - Enabled: enabledFeatureGates, - Disabled: []openshiftv1.FeatureGateAttributes{{Name: apifeatures.FeatureGateMachineAPIOperatorDisableMachineHealthCheckController}}, - }, - }, - }, - }, - proxy: proxy, - expectedConfig: &OperatorConfig{ - TargetNamespace: targetNamespace, - Proxy: proxy, - Controllers: Controllers{ - Provider: images.ClusterAPIControllerLibvirt, - MachineSet: images.MachineAPIOperator, - NodeLink: images.MachineAPIOperator, - MachineHealthCheck: images.MachineAPIOperator, - TerminationHandler: clusterAPIControllerNoOp, - KubeRBACProxy: images.KubeRBACProxy, - }, - PlatformType: openshiftv1.LibvirtPlatformType, - Features: enabledFeatureMap, - }, - }, { name: string(openshiftv1.OpenStackPlatformType), platform: openshiftv1.OpenStackPlatformType,