Skip to content

Commit d8d9ab7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1472 from sdodson/main
OCPBUGS-77941: Remove cluster-api-provider-libvirt references
2 parents 4519aa9 + e74bb11 commit d8d9ab7

7 files changed

Lines changed: 0 additions & 70 deletions

File tree

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ The Machine API Operator (MAO) deploys and manages platform-specific machine con
3535

3636
- [machine-api-provider-azure](https://github.com/openshift/machine-api-provider-azure)
3737

38-
- [cluster-api-provider-libvirt](https://github.com/openshift/cluster-api-provider-libvirt)
39-
4038
- [cluster-api-provider-openstack](https://github.com/openshift/cluster-api-provider-openstack)
4139

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

‎docs/dev/hacking-guide.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ data:
149149
"machineAPIOperator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
150150
"clusterAPIControllerAWS": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
151151
"clusterAPIControllerOpenStack": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
152-
"clusterAPIControllerLibvirt": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
153152
"clusterAPIControllerBareMetal": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
154153
"clusterAPIControllerAzure": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",
155154
"clusterAPIControllerGCP": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ data:
1616
"kubeRBACProxy": "quay.io/openshift/origin-kube-rbac-proxy",
1717
"clusterAPIControllerAWS": "quay.io/openshift/origin-aws-machine-controllers",
1818
"clusterAPIControllerOpenStack": "quay.io/openshift/origin-openstack-machine-api-provider",
19-
"clusterAPIControllerLibvirt": "quay.io/openshift/origin-libvirt-machine-controllers",
2019
"clusterAPIControllerBareMetal": "quay.io/openshift/origin-baremetal-machine-controllers",
2120
"clusterAPIControllerAzure": "quay.io/openshift/origin-azure-machine-controllers",
2221
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers",

‎install/image-references‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ spec:
1414
from:
1515
kind: DockerImage
1616
name: quay.io/openshift/origin-openstack-machine-api-provider
17-
- name: libvirt-machine-controllers
18-
from:
19-
kind: DockerImage
20-
name: quay.io/openshift/origin-libvirt-machine-controllers
2117
- name: baremetal-machine-controllers
2218
from:
2319
kind: DockerImage

‎pkg/operator/config.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ type Images struct {
4141
MachineAPIOperator string `json:"machineAPIOperator"`
4242
ClusterAPIControllerAWS string `json:"clusterAPIControllerAWS"`
4343
ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
44-
ClusterAPIControllerLibvirt string `json:"clusterAPIControllerLibvirt"`
4544
ClusterAPIControllerBareMetal string `json:"clusterAPIControllerBareMetal"`
4645
ClusterAPIControllerAzure string `json:"clusterAPIControllerAzure"`
4746
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
@@ -78,8 +77,6 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
7877
switch platform {
7978
case configv1.AWSPlatformType:
8079
return images.ClusterAPIControllerAWS, nil
81-
case configv1.LibvirtPlatformType:
82-
return images.ClusterAPIControllerLibvirt, nil
8380
case configv1.OpenStackPlatformType:
8481
return images.ClusterAPIControllerOpenStack, nil
8582
case configv1.AzurePlatformType:

‎pkg/operator/config_test.go‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ const (
1919
expectedAzureImage = "quay.io/openshift/origin-azure-machine-controllers"
2020
expectedBareMetalImage = "quay.io/openshift/origin-baremetal-machine-controllers"
2121
expectedGCPImage = "quay.io/openshift/origin-gcp-machine-controllers"
22-
expectedLibvirtImage = "quay.io/openshift/origin-libvirt-machine-controllers"
2322
expectedOpenstackImage = "quay.io/openshift/origin-openstack-machine-api-provider"
2423
expectedPowerVSImage = "quay.io/openshift/origin-powervs-machine-controllers"
2524
expectedVSphereImage = "quay.io/openshift/origin-machine-api-operator"
@@ -92,15 +91,6 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
9291
},
9392
},
9493
expected: configv1.AWSPlatformType,
95-
}, {
96-
infra: &configv1.Infrastructure{
97-
Status: configv1.InfrastructureStatus{
98-
PlatformStatus: &configv1.PlatformStatus{
99-
Type: configv1.LibvirtPlatformType,
100-
},
101-
},
102-
},
103-
expected: configv1.LibvirtPlatformType,
10494
}, {
10595
infra: &configv1.Infrastructure{
10696
Status: configv1.InfrastructureStatus{
@@ -214,9 +204,6 @@ func TestGetImagesFromJSONFile(t *testing.T) {
214204
if img.ClusterAPIControllerAWS != expectedAWSImage {
215205
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedAWSImage, img.ClusterAPIControllerAWS)
216206
}
217-
if img.ClusterAPIControllerLibvirt != expectedLibvirtImage {
218-
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedLibvirtImage, img.ClusterAPIControllerLibvirt)
219-
}
220207
if img.ClusterAPIControllerOpenStack != expectedOpenstackImage {
221208
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOpenstackImage, img.ClusterAPIControllerOpenStack)
222209
}
@@ -251,10 +238,6 @@ func TestGetProviderControllerFromImages(t *testing.T) {
251238
provider: configv1.AWSPlatformType,
252239
expectedImage: expectedAWSImage,
253240
},
254-
{
255-
provider: configv1.LibvirtPlatformType,
256-
expectedImage: expectedLibvirtImage,
257-
},
258241
{
259242
provider: configv1.OpenStackPlatformType,
260243
expectedImage: expectedOpenstackImage,
@@ -332,10 +315,6 @@ func TestGetTerminationHandlerFromImages(t *testing.T) {
332315
provider: configv1.AWSPlatformType,
333316
expectedImage: expectedAWSImage,
334317
},
335-
{
336-
provider: configv1.LibvirtPlatformType,
337-
expectedImage: clusterAPIControllerNoOp,
338-
},
339318
{
340319
provider: configv1.OpenStackPlatformType,
341320
expectedImage: clusterAPIControllerNoOp,

‎pkg/operator/operator_test.go‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,6 @@ func TestOperatorSync_NoOp(t *testing.T) {
144144
platform: openshiftv1.AWSPlatformType,
145145
expectedNoop: false,
146146
},
147-
{
148-
platform: openshiftv1.LibvirtPlatformType,
149-
expectedNoop: false,
150-
},
151147
{
152148
platform: openshiftv1.OpenStackPlatformType,
153149
expectedNoop: false,
@@ -398,40 +394,6 @@ func TestMAOConfigFromInfrastructure(t *testing.T) {
398394
Features: enabledFeatureMap,
399395
},
400396
},
401-
{
402-
name: string(openshiftv1.LibvirtPlatformType),
403-
platform: openshiftv1.LibvirtPlatformType,
404-
infra: infra,
405-
featureGate: &openshiftv1.FeatureGate{
406-
ObjectMeta: metav1.ObjectMeta{
407-
Name: "cluster",
408-
},
409-
Status: openshiftv1.FeatureGateStatus{
410-
FeatureGates: []openshiftv1.FeatureGateDetails{
411-
{
412-
Version: "",
413-
Enabled: enabledFeatureGates,
414-
Disabled: []openshiftv1.FeatureGateAttributes{{Name: apifeatures.FeatureGateMachineAPIOperatorDisableMachineHealthCheckController}},
415-
},
416-
},
417-
},
418-
},
419-
proxy: proxy,
420-
expectedConfig: &OperatorConfig{
421-
TargetNamespace: targetNamespace,
422-
Proxy: proxy,
423-
Controllers: Controllers{
424-
Provider: images.ClusterAPIControllerLibvirt,
425-
MachineSet: images.MachineAPIOperator,
426-
NodeLink: images.MachineAPIOperator,
427-
MachineHealthCheck: images.MachineAPIOperator,
428-
TerminationHandler: clusterAPIControllerNoOp,
429-
KubeRBACProxy: images.KubeRBACProxy,
430-
},
431-
PlatformType: openshiftv1.LibvirtPlatformType,
432-
Features: enabledFeatureMap,
433-
},
434-
},
435397
{
436398
name: string(openshiftv1.OpenStackPlatformType),
437399
platform: openshiftv1.OpenStackPlatformType,

0 commit comments

Comments
 (0)