From b781ded45167d60b577561ab7f8db0bbfc3df08a Mon Sep 17 00:00:00 2001 From: Nir Argaman Date: Thu, 5 Nov 2020 11:23:42 +0200 Subject: [PATCH 1/4] Go modules changes From 7ce2de8a28be17c9a80484b4256a38f533133ab7 Mon Sep 17 00:00:00 2001 From: Nir Argaman Date: Wed, 6 May 2020 10:53:54 +0300 Subject: [PATCH 2/4] Add Kubevirt provider controller type --- .../0000_30_machine-api-operator_01_images.configmap.yaml | 1 + install/image-references | 4 ++++ pkg/operator/config.go | 3 +++ pkg/operator/config_test.go | 8 ++++++++ pkg/operator/fixtures/images.json | 1 + 5 files changed, 17 insertions(+) diff --git a/install/0000_30_machine-api-operator_01_images.configmap.yaml b/install/0000_30_machine-api-operator_01_images.configmap.yaml index d7f3718601..ffd0162211 100644 --- a/install/0000_30_machine-api-operator_01_images.configmap.yaml +++ b/install/0000_30_machine-api-operator_01_images.configmap.yaml @@ -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", diff --git a/install/image-references b/install/image-references index b80cd89472..646ced7d51 100644 --- a/install/image-references +++ b/install/image-references @@ -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 diff --git a/pkg/operator/config.go b/pkg/operator/config.go index ab42ac66df..7fad984b0f 100644 --- a/pkg/operator/config.go +++ b/pkg/operator/config.go @@ -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"` @@ -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: diff --git a/pkg/operator/config_test.go b/pkg/operator/config_test.go index a865445824..3da0ab7f8b 100644 --- a/pkg/operator/config_test.go +++ b/pkg/operator/config_test.go @@ -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) { @@ -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) { @@ -188,6 +192,10 @@ func TestGetProviderControllerFromImages(t *testing.T) { provider: configv1.OvirtPlatformType, expectedImage: expectedOvirtImage, }, + { + provider: configv1.KubevirtPlatformType, + expectedImage: expectedKubevirtImage, + }, } img, err := getImagesFromJSONFile(imagesJSONFile) diff --git a/pkg/operator/fixtures/images.json b/pkg/operator/fixtures/images.json index 533c88d27c..9eab289bb5 100644 --- a/pkg/operator/fixtures/images.json +++ b/pkg/operator/fixtures/images.json @@ -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", From cd46c65d638c2298cb29ab7e5e44a709ffbec47c Mon Sep 17 00:00:00 2001 From: Danielle Barda Date: Thu, 6 Aug 2020 13:53:25 +0300 Subject: [PATCH 3/4] Adding a CR for kubevirt credentials --- ...chine-api-operator_00_credentials-request.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/install/0000_30_machine-api-operator_00_credentials-request.yaml b/install/0000_30_machine-api-operator_00_credentials-request.yaml index 2c727d6630..a2d1ab019d 100644 --- a/install/0000_30_machine-api-operator_00_credentials-request.yaml +++ b/install/0000_30_machine-api-operator_00_credentials-request.yaml @@ -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 +--- From 5f2c63c9473824eff5b4c03a54a88489d6dda599 Mon Sep 17 00:00:00 2001 From: Nir Argaman Date: Wed, 11 Nov 2020 09:22:11 +0200 Subject: [PATCH 4/4] Add "cluster-api-provider-kubevirt" to automated push-updates script --- hack/push-updates.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/push-updates.sh b/hack/push-updates.sh index c5298a13ca..af15e66c3c 100755 --- a/hack/push-updates.sh +++ b/hack/push-updates.sh @@ -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=""