Skip to content

OCPBUGS-51042: Drop oVirt support #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 19, 2025
Merged

OCPBUGS-51042: Drop oVirt support #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ Have a question? See our [Frequently Asked Questions](FAQ.md) for common inquiri
- [cluster-api-provider-openstack](https://github.com/openshift/cluster-api-provider-openstack)

- [cluster-api-provider-baremetal](https://github.com/openshift/cluster-api-provider-baremetal)

- [cluster-api-provider-ovirt](https://github.com/openshift/cluster-api-provider-ovirt)

- [cluster-api-provider-ibmcloud](https://github.com/openshift/cluster-api-provider-ibmcloud)

Expand Down
2 changes: 0 additions & 2 deletions docs/dev/hacking-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ Machine API consists of a number different components:
- https://github.com/openshift/machine-api-operator/tree/master/pkg/controller/vsphere
- https://github.com/openshift/cluster-api-provider-openstack
- https://github.com/openshift/cluster-api-provider-baremetal
- https://github.com/openshift/cluster-api-provider-ovirt

### How to start contributing

Expand Down Expand Up @@ -154,7 +153,6 @@ data:
"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:...",
"clusterAPIControllerOvirt": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
"clusterAPIControllerVSphere": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
"baremetalOperator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
"baremetalIronic": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
Expand Down
1 change: 0 additions & 1 deletion docs/user/machine-api-operator-overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Providers which currently works with MAO, are:
- [vSphere](https://github.com/openshift/machine-api-operator/tree/master/pkg/controller/vsphere)
- [Azure](https://github.com/openshift/cluster-api-provider-azure)
- [BareMetal](https://github.com/openshift/cluster-api-provider-baremetal/)
- [OVirt](https://github.com/openshift/cluster-api-provider-ovirt)

## Works closely, but not directly responsible for

Expand Down
18 changes: 0 additions & 18 deletions install/0000_30_machine-api-operator_00_credentials-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,24 +213,6 @@ spec:
---
apiVersion: cloudcredential.openshift.io/v1
kind: CredentialsRequest
metadata:
labels:
controller-tools.k8s.io: "1.0"
name: openshift-machine-api-ovirt
namespace: openshift-cloud-credential-operator
annotations:
capability.openshift.io/name: MachineAPI+CloudCredential
include.release.openshift.io/self-managed-high-availability: "true"
spec:
secretRef:
name: ovirt-credentials
namespace: openshift-machine-api
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
kind: OvirtProviderSpec
---
apiVersion: cloudcredential.openshift.io/v1
kind: CredentialsRequest
metadata:
labels:
controller-tools.k8s.io: "1.0"
Expand Down
1 change: 0 additions & 1 deletion install/0000_30_machine-api-operator_01_images.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ data:
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers",
"clusterAPIControllerIBMCloud": "quay.io/openshift/origin-ibmcloud-machine-controllers",
"clusterAPIControllerNutanix": "quay.io/openshift/origin-nutanix-machine-controllers",
"clusterAPIControllerOvirt": "quay.io/openshift/origin-ovirt-machine-controllers",
"clusterAPIControllerPowerVS": "quay.io/openshift/origin-powervs-machine-controllers",
"clusterAPIControllerVSphere": "quay.io/openshift/origin-machine-api-operator"
}
4 changes: 0 additions & 4 deletions install/image-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ spec:
from:
kind: DockerImage
name: quay.io/openshift/origin-kube-rbac-proxy
- name: ovirt-machine-controllers
from:
kind: DockerImage
name: quay.io/openshift/origin-ovirt-machine-controllers
- name: nutanix-machine-controllers
from:
kind: DockerImage
Expand Down
3 changes: 0 additions & 3 deletions pkg/operator/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ type Images struct {
ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"`
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
ClusterAPIControllerOvirt string `json:"clusterAPIControllerOvirt"`
ClusterAPIControllerVSphere string `json:"clusterAPIControllerVSphere"`
ClusterAPIControllerIBMCloud string `json:"clusterAPIControllerIBMCloud"`
ClusterAPIControllerPowerVS string `json:"clusterAPIControllerPowerVS"`
Expand Down Expand Up @@ -89,8 +88,6 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
return images.ClusterAPIControllerGCP, nil
case configv1.BareMetalPlatformType:
return images.ClusterAPIControllerBareMetal, nil
case configv1.OvirtPlatformType:
return images.ClusterAPIControllerOvirt, nil
case configv1.VSpherePlatformType:
return images.ClusterAPIControllerVSphere, nil
case configv1.IBMCloudPlatformType:
Expand Down
28 changes: 0 additions & 28 deletions pkg/operator/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ const (
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"
expectedOvirtImage = "quay.io/openshift/origin-ovirt-machine-controllers"
expectedPowerVSImage = "quay.io/openshift/origin-powervs-machine-controllers"
expectedVSphereImage = "quay.io/openshift/origin-machine-api-operator"
expectedNutanixImage = "quay.io/openshift/origin-nutanix-machine-controllers"
Expand Down Expand Up @@ -165,22 +164,6 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
},
},
expected: configv1.NonePlatformType,
}, {
infra: &configv1.Infrastructure{
Status: configv1.InfrastructureStatus{
PlatformStatus: &configv1.PlatformStatus{
Type: configv1.OvirtPlatformType,
},
},
},
expected: configv1.OvirtPlatformType,
}, {
infra: &configv1.Infrastructure{
Status: configv1.InfrastructureStatus{
Platform: configv1.OvirtPlatformType,
},
},
expected: "",
}, {
infra: &configv1.Infrastructure{
Status: configv1.InfrastructureStatus{
Expand Down Expand Up @@ -246,9 +229,6 @@ func TestGetImagesFromJSONFile(t *testing.T) {
if img.ClusterAPIControllerGCP != expectedGCPImage {
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedGCPImage, img.ClusterAPIControllerGCP)
}
if img.ClusterAPIControllerOvirt != expectedOvirtImage {
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOvirtImage, img.ClusterAPIControllerOvirt)
}
if img.ClusterAPIControllerVSphere != expectedVSphereImage {
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedVSphereImage, img.ClusterAPIControllerVSphere)
}
Expand Down Expand Up @@ -303,10 +283,6 @@ func TestGetProviderControllerFromImages(t *testing.T) {
provider: configv1.NonePlatformType,
expectedImage: clusterAPIControllerNoOp,
},
{
provider: configv1.OvirtPlatformType,
expectedImage: expectedOvirtImage,
},
{
provider: configv1.PowerVSPlatformType,
expectedImage: expectedPowerVSImage,
Expand Down Expand Up @@ -388,10 +364,6 @@ func TestGetTerminationHandlerFromImages(t *testing.T) {
provider: configv1.NonePlatformType,
expectedImage: clusterAPIControllerNoOp,
},
{
provider: configv1.OvirtPlatformType,
expectedImage: clusterAPIControllerNoOp,
},
{
provider: configv1.PowerVSPlatformType,
expectedImage: clusterAPIControllerNoOp,
Expand Down
38 changes: 0 additions & 38 deletions pkg/operator/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@ func TestOperatorSync_NoOp(t *testing.T) {
platform: openshiftv1.VSpherePlatformType,
expectedNoop: false,
},
{
platform: openshiftv1.OvirtPlatformType,
expectedNoop: false,
},
{
platform: openshiftv1.PowerVSPlatformType,
expectedNoop: false,
Expand Down Expand Up @@ -642,40 +638,6 @@ func TestMAOConfigFromInfrastructure(t *testing.T) {
Features: enabledFeatureMap,
},
},
{
name: string(openshiftv1.OvirtPlatformType),
platform: openshiftv1.OvirtPlatformType,
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.ClusterAPIControllerOvirt,
MachineSet: images.MachineAPIOperator,
NodeLink: images.MachineAPIOperator,
MachineHealthCheck: images.MachineAPIOperator,
TerminationHandler: clusterAPIControllerNoOp,
KubeRBACProxy: images.KubeRBACProxy,
},
PlatformType: openshiftv1.OvirtPlatformType,
Features: enabledFeatureMap,
},
},
{
name: string(openshiftv1.NonePlatformType),
platform: openshiftv1.NonePlatformType,
Expand Down