Skip to content

Commit 1df65ac

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1333 from openshift-cherrypick-robot/cherry-pick-1331-to-release-4.18
[release-4.18] OCPBUGS-51263: Drop oVirt support
2 parents 53c01a7 + 3ccd777 commit 1df65ac

9 files changed

+0
-97
lines changed

‎README.md

-2
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

-2
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

-1
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

-18
Original file line numberDiff line numberDiff line change
@@ -209,24 +209,6 @@ spec:
209209
---
210210
apiVersion: cloudcredential.openshift.io/v1
211211
kind: CredentialsRequest
212-
metadata:
213-
labels:
214-
controller-tools.k8s.io: "1.0"
215-
name: openshift-machine-api-ovirt
216-
namespace: openshift-cloud-credential-operator
217-
annotations:
218-
capability.openshift.io/name: MachineAPI+CloudCredential
219-
include.release.openshift.io/self-managed-high-availability: "true"
220-
spec:
221-
secretRef:
222-
name: ovirt-credentials
223-
namespace: openshift-machine-api
224-
providerSpec:
225-
apiVersion: cloudcredential.openshift.io/v1
226-
kind: OvirtProviderSpec
227-
---
228-
apiVersion: cloudcredential.openshift.io/v1
229-
kind: CredentialsRequest
230212
metadata:
231213
labels:
232214
controller-tools.k8s.io: "1.0"

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

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ data:
2222
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers",
2323
"clusterAPIControllerIBMCloud": "quay.io/openshift/origin-ibmcloud-machine-controllers",
2424
"clusterAPIControllerNutanix": "quay.io/openshift/origin-nutanix-machine-controllers",
25-
"clusterAPIControllerOvirt": "quay.io/openshift/origin-ovirt-machine-controllers",
2625
"clusterAPIControllerPowerVS": "quay.io/openshift/origin-powervs-machine-controllers",
2726
"clusterAPIControllerVSphere": "quay.io/openshift/origin-machine-api-operator"
2827
}

‎install/image-references

-4
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: nutanix-machine-controllers
5450
from:
5551
kind: DockerImage

‎pkg/operator/config.go

-3
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"`
@@ -89,8 +88,6 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
8988
return images.ClusterAPIControllerGCP, nil
9089
case configv1.BareMetalPlatformType:
9190
return images.ClusterAPIControllerBareMetal, nil
92-
case configv1.OvirtPlatformType:
93-
return images.ClusterAPIControllerOvirt, nil
9491
case configv1.VSpherePlatformType:
9592
return images.ClusterAPIControllerVSphere, nil
9693
case configv1.IBMCloudPlatformType:

‎pkg/operator/config_test.go

-28
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"
@@ -165,22 +164,6 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
165164
},
166165
},
167166
expected: configv1.NonePlatformType,
168-
}, {
169-
infra: &configv1.Infrastructure{
170-
Status: configv1.InfrastructureStatus{
171-
PlatformStatus: &configv1.PlatformStatus{
172-
Type: configv1.OvirtPlatformType,
173-
},
174-
},
175-
},
176-
expected: configv1.OvirtPlatformType,
177-
}, {
178-
infra: &configv1.Infrastructure{
179-
Status: configv1.InfrastructureStatus{
180-
Platform: configv1.OvirtPlatformType,
181-
},
182-
},
183-
expected: "",
184167
}, {
185168
infra: &configv1.Infrastructure{
186169
Status: configv1.InfrastructureStatus{
@@ -246,9 +229,6 @@ func TestGetImagesFromJSONFile(t *testing.T) {
246229
if img.ClusterAPIControllerGCP != expectedGCPImage {
247230
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedGCPImage, img.ClusterAPIControllerGCP)
248231
}
249-
if img.ClusterAPIControllerOvirt != expectedOvirtImage {
250-
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOvirtImage, img.ClusterAPIControllerOvirt)
251-
}
252232
if img.ClusterAPIControllerVSphere != expectedVSphereImage {
253233
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedVSphereImage, img.ClusterAPIControllerVSphere)
254234
}
@@ -303,10 +283,6 @@ func TestGetProviderControllerFromImages(t *testing.T) {
303283
provider: configv1.NonePlatformType,
304284
expectedImage: clusterAPIControllerNoOp,
305285
},
306-
{
307-
provider: configv1.OvirtPlatformType,
308-
expectedImage: expectedOvirtImage,
309-
},
310286
{
311287
provider: configv1.PowerVSPlatformType,
312288
expectedImage: expectedPowerVSImage,
@@ -388,10 +364,6 @@ func TestGetTerminationHandlerFromImages(t *testing.T) {
388364
provider: configv1.NonePlatformType,
389365
expectedImage: clusterAPIControllerNoOp,
390366
},
391-
{
392-
provider: configv1.OvirtPlatformType,
393-
expectedImage: clusterAPIControllerNoOp,
394-
},
395367
{
396368
provider: configv1.PowerVSPlatformType,
397369
expectedImage: clusterAPIControllerNoOp,

‎pkg/operator/operator_test.go

-38
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ func TestOperatorSync_NoOp(t *testing.T) {
170170
platform: openshiftv1.VSpherePlatformType,
171171
expectedNoop: false,
172172
},
173-
{
174-
platform: openshiftv1.OvirtPlatformType,
175-
expectedNoop: false,
176-
},
177173
{
178174
platform: openshiftv1.PowerVSPlatformType,
179175
expectedNoop: false,
@@ -638,40 +634,6 @@ func TestMAOConfigFromInfrastructure(t *testing.T) {
638634
Features: enabledFeatureMap,
639635
},
640636
},
641-
{
642-
name: string(openshiftv1.OvirtPlatformType),
643-
platform: openshiftv1.OvirtPlatformType,
644-
infra: infra,
645-
featureGate: &openshiftv1.FeatureGate{
646-
ObjectMeta: metav1.ObjectMeta{
647-
Name: "cluster",
648-
},
649-
Status: openshiftv1.FeatureGateStatus{
650-
FeatureGates: []openshiftv1.FeatureGateDetails{
651-
{
652-
Version: "",
653-
Enabled: enabledFeatureGates,
654-
Disabled: []openshiftv1.FeatureGateAttributes{{Name: apifeatures.FeatureGateMachineAPIOperatorDisableMachineHealthCheckController}},
655-
},
656-
},
657-
},
658-
},
659-
proxy: proxy,
660-
expectedConfig: &OperatorConfig{
661-
TargetNamespace: targetNamespace,
662-
Proxy: proxy,
663-
Controllers: Controllers{
664-
Provider: images.ClusterAPIControllerOvirt,
665-
MachineSet: images.MachineAPIOperator,
666-
NodeLink: images.MachineAPIOperator,
667-
MachineHealthCheck: images.MachineAPIOperator,
668-
TerminationHandler: clusterAPIControllerNoOp,
669-
KubeRBACProxy: images.KubeRBACProxy,
670-
},
671-
PlatformType: openshiftv1.OvirtPlatformType,
672-
Features: enabledFeatureMap,
673-
},
674-
},
675637
{
676638
name: string(openshiftv1.NonePlatformType),
677639
platform: openshiftv1.NonePlatformType,

0 commit comments

Comments
 (0)