Skip to content

Commit fe4f74d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1336 from JoelSpeed/drop-ovirt-4.16
OCPBUGS-52342: Drop oVirt support
2 parents ac37878 + c9209ab commit fe4f74d

9 files changed

+0
-82
lines changed

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ Have a question? See our [Frequently Asked Questions](FAQ.md) for common inquiri
3838
- [cluster-api-provider-openstack](https://github.com/openshift/cluster-api-provider-openstack)
3939

4040
- [cluster-api-provider-baremetal](https://github.com/openshift/cluster-api-provider-baremetal)
41-
42-
- [cluster-api-provider-ovirt](https://github.com/openshift/cluster-api-provider-ovirt)
4341

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

‎docs/dev/hacking-guide.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ Machine API consists of a number different components:
4141
- https://github.com/openshift/machine-api-operator/tree/master/pkg/controller/vsphere
4242
- https://github.com/openshift/cluster-api-provider-openstack
4343
- https://github.com/openshift/cluster-api-provider-baremetal
44-
- https://github.com/openshift/cluster-api-provider-ovirt
4544

4645
### How to start contributing
4746

@@ -154,7 +153,6 @@ data:
154153
"clusterAPIControllerBareMetal": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
155154
"clusterAPIControllerAzure": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
156155
"clusterAPIControllerGCP": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
157-
"clusterAPIControllerOvirt": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
158156
"clusterAPIControllerVSphere": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
159157
"baremetalOperator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
160158
"baremetalIronic": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",

‎docs/user/machine-api-operator-overview.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ Providers which currently works with MAO, are:
5353
- [vSphere](https://github.com/openshift/machine-api-operator/tree/master/pkg/controller/vsphere)
5454
- [Azure](https://github.com/openshift/cluster-api-provider-azure)
5555
- [BareMetal](https://github.com/openshift/cluster-api-provider-baremetal/)
56-
- [OVirt](https://github.com/openshift/cluster-api-provider-ovirt)
5756

5857
## Works closely, but not directly responsible for
5958

‎install/0000_30_machine-api-operator_00_credentials-request.yaml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -211,24 +211,6 @@ spec:
211211
---
212212
apiVersion: cloudcredential.openshift.io/v1
213213
kind: CredentialsRequest
214-
metadata:
215-
labels:
216-
controller-tools.k8s.io: "1.0"
217-
name: openshift-machine-api-ovirt
218-
namespace: openshift-cloud-credential-operator
219-
annotations:
220-
capability.openshift.io/name: MachineAPI+CloudCredential
221-
include.release.openshift.io/self-managed-high-availability: "true"
222-
spec:
223-
secretRef:
224-
name: ovirt-credentials
225-
namespace: openshift-machine-api
226-
providerSpec:
227-
apiVersion: cloudcredential.openshift.io/v1
228-
kind: OvirtProviderSpec
229-
---
230-
apiVersion: cloudcredential.openshift.io/v1
231-
kind: CredentialsRequest
232214
metadata:
233215
labels:
234216
controller-tools.k8s.io: "1.0"

‎install/0000_30_machine-api-operator_01_images.configmap.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ data:
2323
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers",
2424
"clusterAPIControllerIBMCloud": "quay.io/openshift/origin-ibmcloud-machine-controllers",
2525
"clusterAPIControllerNutanix": "quay.io/openshift/origin-nutanix-machine-controllers",
26-
"clusterAPIControllerOvirt": "quay.io/openshift/origin-ovirt-machine-controllers",
2726
"clusterAPIControllerPowerVS": "quay.io/openshift/origin-powervs-machine-controllers",
2827
"clusterAPIControllerVSphere": "quay.io/openshift/origin-machine-api-operator"
2928
}

‎install/image-references‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ spec:
4646
from:
4747
kind: DockerImage
4848
name: quay.io/openshift/origin-kube-rbac-proxy
49-
- name: ovirt-machine-controllers
50-
from:
51-
kind: DockerImage
52-
name: quay.io/openshift/origin-ovirt-machine-controllers
5349
- name: alibaba-machine-controllers
5450
from:
5551
kind: DockerImage

‎pkg/operator/config.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ type Images struct {
4545
ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
4646
ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"`
4747
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
48-
ClusterAPIControllerOvirt string `json:"clusterAPIControllerOvirt"`
4948
ClusterAPIControllerVSphere string `json:"clusterAPIControllerVSphere"`
5049
ClusterAPIControllerIBMCloud string `json:"clusterAPIControllerIBMCloud"`
5150
ClusterAPIControllerPowerVS string `json:"clusterAPIControllerPowerVS"`
@@ -91,8 +90,6 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
9190
return images.ClusterAPIControllerGCP, nil
9291
case configv1.BareMetalPlatformType:
9392
return images.ClusterAPIControllerBareMetal, nil
94-
case configv1.OvirtPlatformType:
95-
return images.ClusterAPIControllerOvirt, nil
9693
case configv1.VSpherePlatformType:
9794
return images.ClusterAPIControllerVSphere, nil
9895
case configv1.IBMCloudPlatformType:

‎pkg/operator/config_test.go‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ const (
2121
expectedGCPImage = "quay.io/openshift/origin-gcp-machine-controllers"
2222
expectedLibvirtImage = "quay.io/openshift/origin-libvirt-machine-controllers"
2323
expectedOpenstackImage = "quay.io/openshift/origin-openstack-machine-api-provider"
24-
expectedOvirtImage = "quay.io/openshift/origin-ovirt-machine-controllers"
2524
expectedPowerVSImage = "quay.io/openshift/origin-powervs-machine-controllers"
2625
expectedVSphereImage = "quay.io/openshift/origin-machine-api-operator"
2726
expectedNutanixImage = "quay.io/openshift/origin-nutanix-machine-controllers"
@@ -174,22 +173,6 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
174173
},
175174
},
176175
expected: configv1.NonePlatformType,
177-
}, {
178-
infra: &configv1.Infrastructure{
179-
Status: configv1.InfrastructureStatus{
180-
PlatformStatus: &configv1.PlatformStatus{
181-
Type: configv1.OvirtPlatformType,
182-
},
183-
},
184-
},
185-
expected: configv1.OvirtPlatformType,
186-
}, {
187-
infra: &configv1.Infrastructure{
188-
Status: configv1.InfrastructureStatus{
189-
Platform: configv1.OvirtPlatformType,
190-
},
191-
},
192-
expected: "",
193176
}, {
194177
infra: &configv1.Infrastructure{
195178
Status: configv1.InfrastructureStatus{
@@ -255,9 +238,6 @@ func TestGetImagesFromJSONFile(t *testing.T) {
255238
if img.ClusterAPIControllerGCP != expectedGCPImage {
256239
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedGCPImage, img.ClusterAPIControllerGCP)
257240
}
258-
if img.ClusterAPIControllerOvirt != expectedOvirtImage {
259-
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOvirtImage, img.ClusterAPIControllerOvirt)
260-
}
261241
if img.ClusterAPIControllerVSphere != expectedVSphereImage {
262242
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedVSphereImage, img.ClusterAPIControllerVSphere)
263243
}
@@ -316,10 +296,6 @@ func TestGetProviderControllerFromImages(t *testing.T) {
316296
provider: configv1.NonePlatformType,
317297
expectedImage: clusterAPIControllerNoOp,
318298
},
319-
{
320-
provider: configv1.OvirtPlatformType,
321-
expectedImage: expectedOvirtImage,
322-
},
323299
{
324300
provider: configv1.PowerVSPlatformType,
325301
expectedImage: expectedPowerVSImage,
@@ -405,10 +381,6 @@ func TestGetTerminationHandlerFromImages(t *testing.T) {
405381
provider: configv1.NonePlatformType,
406382
expectedImage: clusterAPIControllerNoOp,
407383
},
408-
{
409-
provider: configv1.OvirtPlatformType,
410-
expectedImage: clusterAPIControllerNoOp,
411-
},
412384
{
413385
provider: configv1.PowerVSPlatformType,
414386
expectedImage: clusterAPIControllerNoOp,

‎pkg/operator/operator_test.go‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ func TestOperatorSync_NoOp(t *testing.T) {
152152
platform: openshiftv1.VSpherePlatformType,
153153
expectedNoop: false,
154154
},
155-
{
156-
platform: openshiftv1.OvirtPlatformType,
157-
expectedNoop: false,
158-
},
159155
{
160156
platform: openshiftv1.PowerVSPlatformType,
161157
expectedNoop: false,
@@ -519,25 +515,6 @@ func TestMAOConfigFromInfrastructure(t *testing.T) {
519515
PlatformType: openshiftv1.VSpherePlatformType,
520516
},
521517
},
522-
{
523-
name: string(openshiftv1.OvirtPlatformType),
524-
platform: openshiftv1.OvirtPlatformType,
525-
infra: infra,
526-
proxy: proxy,
527-
expectedConfig: &OperatorConfig{
528-
TargetNamespace: targetNamespace,
529-
Proxy: proxy,
530-
Controllers: Controllers{
531-
Provider: images.ClusterAPIControllerOvirt,
532-
MachineSet: images.MachineAPIOperator,
533-
NodeLink: images.MachineAPIOperator,
534-
MachineHealthCheck: images.MachineAPIOperator,
535-
TerminationHandler: clusterAPIControllerNoOp,
536-
KubeRBACProxy: images.KubeRBACProxy,
537-
},
538-
PlatformType: openshiftv1.OvirtPlatformType,
539-
},
540-
},
541518
{
542519
name: string(openshiftv1.NonePlatformType),
543520
platform: openshiftv1.NonePlatformType,

0 commit comments

Comments
 (0)