Skip to content
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

Jump to bottom

remove kubevirt images and references #873

Merged
merged 1 commit into from Jun 17, 2021
Merged

remove kubevirt images and references #873

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion install/0000_30_machine-api-operator_01_images.configmap.yaml
View file
Open in desktop
Expand Up @@ -19,6 +19,5 @@ data:
"clusterAPIControllerAzure": "registry.svc.ci.openshift.org/openshift:azure-machine-controllers",
"clusterAPIControllerGCP": "registry.svc.ci.openshift.org/openshift:gcp-machine-controllers",
"clusterAPIControllerOvirt": "registry.svc.ci.openshift.org/openshift:ovirt-machine-controllers",
"clusterAPIControllerKubevirt": "registry.svc.ci.openshift.org/openshift:kubevirt-machine-controllers",
"clusterAPIControllerVSphere": "registry.svc.ci.openshift.org/openshift:machine-api-operator"
}
4 changes: 0 additions & 4 deletions install/image-references
View file
Open in desktop
Expand Up @@ -62,7 +62,3 @@ spec:
from:
kind: DockerImage
name: registry.svc.ci.openshift.org/openshift:ovirt-machine-controllers
- name: kubevirt-machine-controllers
from:
kind: DockerImage
name: registry.svc.ci.openshift.org/openshift:kubevirt-machine-controllers
8 changes: 0 additions & 8 deletions pkg/operator/config_test.go
View file
Open in desktop
Expand Up @@ -18,7 +18,6 @@ var (
expectedGCPImage = "quay.io/openshift/origin-gcp-machine-controllers:v4.0.0"
expectedOvirtImage = "quay.io/openshift/origin-ovirt-machine-controllers"
expectedVSphereImage = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
expectedKubevirtImage = "quay.io/openshift/origin-kubevirt-machine-controllers"
)

func TestGetProviderFromInfrastructure(t *testing.T) {
Expand Down Expand Up @@ -165,9 +164,6 @@ func TestGetImagesFromJSONFile(t *testing.T) {
if img.ClusterAPIControllerVSphere != expectedVSphereImage {
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedVSphereImage, img.ClusterAPIControllerVSphere)
}
if img.ClusterAPIControllerKubevirt != expectedKubevirtImage {
t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedKubevirtImage, img.ClusterAPIControllerKubevirt)
}
}

func TestGetProviderControllerFromImages(t *testing.T) {
Expand Down Expand Up @@ -214,10 +210,6 @@ func TestGetProviderControllerFromImages(t *testing.T) {
provider: configv1.OvirtPlatformType,
expectedImage: expectedOvirtImage,
},
{
provider: configv1.KubevirtPlatformType,
expectedImage: expectedKubevirtImage,
},
}

img, err := getImagesFromJSONFile(imagesJSONFile)
Expand Down
1 change: 0 additions & 1 deletion pkg/operator/fixtures/images.json
View file
Open in desktop
Expand Up @@ -8,6 +8,5 @@
"clusterAPIControllerGCP": "quay.io/openshift/origin-gcp-machine-controllers:v4.0.0",
"clusterAPIControllerOvirt": "quay.io/openshift/origin-ovirt-machine-controllers",
"clusterAPIControllerVSphere": "docker.io/openshift/origin-machine-api-operator:v4.0.0",
"clusterAPIControllerKubevirt": "quay.io/openshift/origin-kubevirt-machine-controllers",
"kubeRBACProxy": "docker.io/openshift/origin-kube-rbac-proxy:v4.0.0"
}