Add libvirtproviderconfig under openshift.io group

Makefile

@@ -39,13 +39,18 @@ vendor:
 	dep ensure -v
 
 .PHONY: generate
-generate: gendeepcopy
+generate: gendeepcopy gencode
+
+.PHONY: gencode
+gencode:
+	go install $(GOGCFLAGS) -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/vendor/github.com/golang/mock/mockgen
+	go generate ./pkg/... ./cmd/...
 
 .PHONY: gendeepcopy
 gendeepcopy:
 	go build -o $$GOPATH/bin/deepcopy-gen "$(REPO_PATH)/vendor/k8s.io/code-generator/cmd/deepcopy-gen"
 	deepcopy-gen \
-          -i ./pkg/apis/libvirtproviderconfig,./pkg/apis/libvirtproviderconfig/v1alpha1 \
+          -i ./pkg/apis/libvirtproviderconfig,./pkg/apis/libvirtproviderconfig/v1beta1 \
           -O zz_generated.deepcopy \
           -h hack/boilerplate.go.txt
 
@@ -73,7 +78,7 @@ check: fmt vet lint test ## Check your code
 
 .PHONY: test
 test: # Run unit test
-	$(DOCKER_CMD) go test -race -cover ./cmd/... ./cloud/...
+	$(DOCKER_CMD) go test -race -cover ./cmd/... ./pkg/cloud/...
 
 .PHONY: build-e2e
 build-e2e:

cmd/libvirt-actuator/utils/utils.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/ghodss/yaml"
 	"github.com/golang/glog"
-	"github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	"github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	machineactuator "github.com/openshift/cluster-api-provider-libvirt/pkg/cloud/libvirt/actuators/machine"
 	libvirtclient "github.com/openshift/cluster-api-provider-libvirt/pkg/cloud/libvirt/client"
 	"github.com/openshift/cluster-api-provider-libvirt/test"
@@ -66,7 +66,7 @@ func CreateActuator(machine *machinev1.Machine, userData *apiv1.Secret) *machine
 	}
 	fakeKubeClient := kubernetesfake.NewSimpleClientset(objList...)
 
-	codec, err := v1alpha1.NewCodec()
+	codec, err := v1beta1.NewCodec()
 	if err != nil {
 		glog.Fatal(err)
 	}

cmd/manager/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/openshift/cluster-api-provider-libvirt/pkg/apis"
-	"github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	"github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	machineactuator "github.com/openshift/cluster-api-provider-libvirt/pkg/cloud/libvirt/actuators/machine"
 	libvirtclient "github.com/openshift/cluster-api-provider-libvirt/pkg/cloud/libvirt/client"
 	"github.com/openshift/cluster-api-provider-libvirt/pkg/controller"
@@ -79,7 +79,7 @@ func initActuator(m manager.Manager) {
 		glog.Fatalf("Could not create kubernetes client to talk to the apiserver: %v", err)
 	}
 
-	codec, err := v1alpha1.NewCodec()
+	codec, err := v1beta1.NewCodec()
 	if err != nil {
 		glog.Fatal(err)
 	}

hack/boilerplate.go.txt

@@ -0,0 +1,15 @@
+/*
+Copyright YEAR The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/

pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go → pkg/apis/addtoscheme_libvirtproviderconfig_v1beta1.go

@@ -1,10 +1,10 @@
 package apis
 
 import (
-	"github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	"github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 )
 
 func init() {
 	// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
-	AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme)
+	AddToSchemes = append(AddToSchemes, v1beta1.SchemeBuilder.AddToScheme)
 }

pkg/apis/libvirtproviderconfig/v1alpha1/doc.go → pkg/apis/libvirtproviderconfig/v1beta1/doc.go

@@ -1,7 +1,7 @@
-// Package v1alpha1 contains API Schema definitions for the libvirtproviderconfig v1alpha1 API group
+// Package v1beta1 contains API Schema definitions for the libvirtproviderconfig v1beta1 API group
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=libvirtproviderconfig.k8s.io
-package v1alpha1
+// +groupName=libvirtproviderconfig.openshift.io
+package v1beta1

pkg/apis/libvirtproviderconfig/v1alpha1/libvirtmachineproviderconfig_types.go → pkg/apis/libvirtproviderconfig/v1beta1/libvirtmachineproviderconfig_types.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1
 
 import (
 	corev1 "k8s.io/api/core/v1"

pkg/apis/libvirtproviderconfig/v1alpha1/register.go → pkg/apis/libvirtproviderconfig/v1beta1/register.go

@@ -1,17 +1,19 @@
 // NOTE: Boilerplate only.  Ignore this file.
 
-// Package v1alpha1 contains API Schema definitions for the libvirtproviderconfig v1alpha1 API group
+// Package v1beta1 contains API Schema definitions for the libvirtproviderconfig v1beta1 API group
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=libvirtproviderconfig.k8s.io
-package v1alpha1
+// +groupName=libvirtproviderconfig.openshift.io
+package v1beta1
 
 import (
 	"bytes"
 	"fmt"
 
+	"github.com/ghodss/yaml"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -22,7 +24,7 @@ import (
 
 var (
 	// SchemeGroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "libvirtproviderconfig.k8s.io", Version: "v1alpha1"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "libvirtproviderconfig.openshift.io", Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
@@ -61,8 +63,11 @@ func NewCodec() (*LibvirtProviderConfigCodec, error) {
 // DecodeFromProviderSpec decodes a serialised ProviderConfig into an object
 func (codec *LibvirtProviderConfigCodec) DecodeFromProviderSpec(providerConfig machinev1.ProviderSpec, out runtime.Object) error {
 	if providerConfig.Value != nil {
-		_, _, err := codec.decoder.Decode(providerConfig.Value.Raw, nil, out)
-		if err != nil {
+		// TODO(jchaloup): revert back to using `Decode` once installer and mao have started using
+		// libvirtprovider apis pivoted under openshift.io api group
+		// _, _, err := codec.decoder.Decode(providerConfig.Value.Raw, nil, out)
+		// if err != nil {
+		if err := yaml.Unmarshal(providerConfig.Value.Raw, out); err != nil {
 			return fmt.Errorf("decoding failure: %v", err)
 		}
 	}
@@ -93,8 +98,11 @@ func (codec *LibvirtProviderConfigCodec) EncodeProviderStatus(in runtime.Object)
 // DecodeProviderStatus decodes a serialised providerStatus into an object
 func (codec *LibvirtProviderConfigCodec) DecodeProviderStatus(providerStatus *runtime.RawExtension, out runtime.Object) error {
 	if providerStatus != nil {
-		_, _, err := codec.decoder.Decode(providerStatus.Raw, nil, out)
-		if err != nil {
+		// TODO(jchaloup): revert back to using `Decode` once installer and mao have started using
+		// libvirtprovider apis pivoted under openshift.io api group
+		// _, _, err := codec.decoder.Decode(providerStatus.Raw, nil, out)
+		// if err != nil {
+		if err := yaml.Unmarshal(providerStatus.Raw, out); err != nil {
 			return fmt.Errorf("decoding failure: %v", err)
 		}
 	}

pkg/apis/libvirtproviderconfig/v1alpha1/v1alpha1_suite_test.go → pkg/apis/libvirtproviderconfig/v1beta1/v1alpha1_suite_test.go

@@ -1,4 +1,4 @@
-package v1alpha1
+package v1beta1
 
 import (
 	"log"

pkg/cloud/libvirt/actuators/machine/actuator.go

@@ -21,7 +21,7 @@ import (
 
 	libvirt "github.com/libvirt/libvirt-go"
 
-	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	libvirtclient "github.com/openshift/cluster-api-provider-libvirt/pkg/cloud/libvirt/client"
 
 	"k8s.io/apimachinery/pkg/api/equality"

pkg/cloud/libvirt/actuators/machine/actuator_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	libvirt "github.com/libvirt/libvirt-go"
-	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	libvirtclient "github.com/openshift/cluster-api-provider-libvirt/pkg/cloud/libvirt/client"
 	mocklibvirt "github.com/openshift/cluster-api-provider-libvirt/pkg/cloud/libvirt/client/mock"
 	fakeclusterclientset "github.com/openshift/cluster-api-provider-libvirt/test"

pkg/cloud/libvirt/actuators/machine/stubs.go

@@ -5,7 +5,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 )
 

pkg/cloud/libvirt/client/client.go

@@ -7,7 +7,7 @@ import (
 	"github.com/golang/glog"
 	libvirt "github.com/libvirt/libvirt-go"
 	libvirtxml "github.com/libvirt/libvirt-go-xml"
-	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 	"k8s.io/client-go/kubernetes"
 )
 

pkg/cloud/libvirt/client/cloudinit.go

@@ -17,7 +17,7 @@ import (
 	"github.com/golang/glog"
 
 	libvirtxml "github.com/libvirt/libvirt-go-xml"
-	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 )
 
 func setCloudInit(domainDef *libvirtxml.Domain, client *libvirtClient, cloudInit *providerconfigv1.CloudInit, kubeClient kubernetes.Interface, machineNamespace, volumeName, poolName, domainName string) error {

pkg/cloud/libvirt/client/ignition.go

@@ -14,7 +14,7 @@ import (
 	"github.com/golang/glog"
 	libvirt "github.com/libvirt/libvirt-go"
 	libvirtxml "github.com/libvirt/libvirt-go-xml"
-	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1"
+	providerconfigv1 "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
 )
 
 func setIgnition(domainDef *libvirtxml.Domain, client *libvirtClient, ignition *providerconfigv1.Ignition, kubeClient kubernetes.Interface, machineNamespace, volumeName, poolName string) error {