Skip to content

Add Kubevirt provider #716

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
openshift-merge-robot merged 4 commits into from
Nov 24, 2020
Merged

Add Kubevirt provider #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b781ded
Go modules changes
nirarg Nov 5, 2020
7ce2de8
Add Kubevirt provider controller type
May 6, 2020
cd46c65
Adding a CR for kubevirt credentials
bardielle Aug 6, 2020
5f2c63c
Add "cluster-api-provider-kubevirt" to automated push-updates script
nirarg Nov 11, 2020
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
1 change: 1 addition & 0 deletions hack/push-updates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ cluster-api-provider-azure
cluster-api-provider-baremetal
cluster-api-provider-gcp
cluster-api-provider-openstack
cluster-api-provider-kubevirt
"
TITLE=""
SHA=""
Expand Down
15 changes: 15 additions & 0 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 @@ -151,3 +151,18 @@ spec:
apiVersion: cloudcredential.openshift.io/v1
kind: VSphereProviderSpec
---
apiVersion: cloudcredential.openshift.io/v1
kind: CredentialsRequest
metadata:
labels:
controller-tools.k8s.io: "1.0"
name: openshift-machine-api-kubevirt
namespace: openshift-cloud-credential-operator
spec:
secretRef:
namespace: openshift-machine-api
name: kubevirt-credentials
providerSpec:
apiVersion: cloudcredential.openshift.io/v1
kind: KubevirtProviderSpec
---
1 change: 1 addition & 0 deletions 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 @@ -18,6 +18,7 @@ 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",
"baremetalOperator": "registry.svc.ci.openshift.org/openshift:baremetal-operator",
"baremetalIronic": "registry.svc.ci.openshift.org/openshift:ironic",
Expand Down
4 changes: 4 additions & 0 deletions install/image-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,7 @@ 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
3 changes: 3 additions & 0 deletions pkg/operator/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ type Images struct {
ClusterAPIControllerGCP string `json:"clusterAPIControllerGCP"`
ClusterAPIControllerOvirt string `json:"clusterAPIControllerOvirt"`
ClusterAPIControllerVSphere string `json:"clusterAPIControllerVSphere"`
ClusterAPIControllerKubevirt string `json:"clusterAPIControllerKubevirt"`
KubeRBACProxy string `json:"kubeRBACProxy"`
// Images required for the metal3 pod
BaremetalOperator string `json:"baremetalOperator"`
Expand Down Expand Up @@ -103,6 +104,8 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
return images.ClusterAPIControllerOvirt, nil
case configv1.VSpherePlatformType:
return images.ClusterAPIControllerVSphere, nil
case configv1.KubevirtPlatformType:
return images.ClusterAPIControllerKubevirt, nil
case kubemarkPlatform:
return clusterAPIControllerKubemark, nil
default:
Expand Down
8 changes: 8 additions & 0 deletions pkg/operator/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var (
expectedIronicStaticIpManager = "quay.io/openshift/origin-ironic-static-ip-manager:v4.2.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 @@ -142,6 +143,9 @@ 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 @@ -188,6 +192,10 @@ func TestGetProviderControllerFromImages(t *testing.T) {
provider: configv1.OvirtPlatformType,
expectedImage: expectedOvirtImage,
},
{
provider: configv1.KubevirtPlatformType,
expectedImage: expectedKubevirtImage,
},
}

img, err := getImagesFromJSONFile(imagesJSONFile)
Expand Down
1 change: 1 addition & 0 deletions pkg/operator/fixtures/images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"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",
"baremetalOperator": "quay.io/openshift/origin-baremetal-operator:v4.2.0",
"baremetalIronic": "quay.io/openshift/origin-ironic:v4.2.0",
"baremetalIronicInspector": "quay.io/openshift/origin-ironic-inspector:v4.2.0",
Expand Down