From bb2a871c13f1198451e86a929b7dea51c26365f0 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Mon, 11 Feb 2019 10:19:47 +0100 Subject: [PATCH] Add libvirtproviderconfig under openshift.io group --- Makefile | 11 ++- cmd/libvirt-actuator/utils/utils.go | 4 +- cmd/manager/main.go | 4 +- hack/boilerplate.go.txt | 15 ++++ ...toscheme_libvirtproviderconfig_v1beta1.go} | 4 +- .../{v1alpha1 => v1beta1}/doc.go | 6 +- .../libvirtmachineproviderconfig_types.go | 2 +- .../{v1alpha1 => v1beta1}/register.go | 24 ++++-- .../v1alpha1_suite_test.go | 2 +- .../zz_generated.deepcopy.go | 78 ++++++++++++------- .../libvirt/actuators/machine/actuator.go | 2 +- .../actuators/machine/actuator_test.go | 2 +- pkg/cloud/libvirt/actuators/machine/stubs.go | 2 +- pkg/cloud/libvirt/client/client.go | 2 +- pkg/cloud/libvirt/client/cloudinit.go | 2 +- pkg/cloud/libvirt/client/ignition.go | 2 +- .../libvirt/client/mock/client_generated.go | 16 ---- test/utils/manifests.go | 2 +- 18 files changed, 108 insertions(+), 72 deletions(-) create mode 100644 hack/boilerplate.go.txt rename pkg/apis/{addtoscheme_libvirtproviderconfig_v1alpha1.go => addtoscheme_libvirtproviderconfig_v1beta1.go} (67%) rename pkg/apis/libvirtproviderconfig/{v1alpha1 => v1beta1}/doc.go (54%) rename pkg/apis/libvirtproviderconfig/{v1alpha1 => v1beta1}/libvirtmachineproviderconfig_types.go (99%) rename pkg/apis/libvirtproviderconfig/{v1alpha1 => v1beta1}/register.go (79%) rename pkg/apis/libvirtproviderconfig/{v1alpha1 => v1beta1}/v1alpha1_suite_test.go (97%) rename pkg/apis/libvirtproviderconfig/{v1alpha1 => v1beta1}/zz_generated.deepcopy.go (82%) diff --git a/Makefile b/Makefile index 9fdffa75a..35d8fd445 100644 --- a/Makefile +++ b/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: diff --git a/cmd/libvirt-actuator/utils/utils.go b/cmd/libvirt-actuator/utils/utils.go index fae1d5cc4..041f29095 100644 --- a/cmd/libvirt-actuator/utils/utils.go +++ b/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) } diff --git a/cmd/manager/main.go b/cmd/manager/main.go index eeea46121..9d118f9f6 100644 --- a/cmd/manager/main.go +++ b/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) } diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt new file mode 100644 index 000000000..4b76f1fdd --- /dev/null +++ b/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. +*/ diff --git a/pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go b/pkg/apis/addtoscheme_libvirtproviderconfig_v1beta1.go similarity index 67% rename from pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go rename to pkg/apis/addtoscheme_libvirtproviderconfig_v1beta1.go index d6e363c0c..b28b86316 100644 --- a/pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go +++ b/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) } diff --git a/pkg/apis/libvirtproviderconfig/v1alpha1/doc.go b/pkg/apis/libvirtproviderconfig/v1beta1/doc.go similarity index 54% rename from pkg/apis/libvirtproviderconfig/v1alpha1/doc.go rename to pkg/apis/libvirtproviderconfig/v1beta1/doc.go index 3824c6877..2a5eabdf7 100644 --- a/pkg/apis/libvirtproviderconfig/v1alpha1/doc.go +++ b/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 diff --git a/pkg/apis/libvirtproviderconfig/v1alpha1/libvirtmachineproviderconfig_types.go b/pkg/apis/libvirtproviderconfig/v1beta1/libvirtmachineproviderconfig_types.go similarity index 99% rename from pkg/apis/libvirtproviderconfig/v1alpha1/libvirtmachineproviderconfig_types.go rename to pkg/apis/libvirtproviderconfig/v1beta1/libvirtmachineproviderconfig_types.go index 4cbad81d7..235af3864 100644 --- a/pkg/apis/libvirtproviderconfig/v1alpha1/libvirtmachineproviderconfig_types.go +++ b/pkg/apis/libvirtproviderconfig/v1beta1/libvirtmachineproviderconfig_types.go @@ -1,4 +1,4 @@ -package v1alpha1 +package v1beta1 import ( corev1 "k8s.io/api/core/v1" diff --git a/pkg/apis/libvirtproviderconfig/v1alpha1/register.go b/pkg/apis/libvirtproviderconfig/v1beta1/register.go similarity index 79% rename from pkg/apis/libvirtproviderconfig/v1alpha1/register.go rename to pkg/apis/libvirtproviderconfig/v1beta1/register.go index b0e4d149f..44ad18606 100644 --- a/pkg/apis/libvirtproviderconfig/v1alpha1/register.go +++ b/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) } } diff --git a/pkg/apis/libvirtproviderconfig/v1alpha1/v1alpha1_suite_test.go b/pkg/apis/libvirtproviderconfig/v1beta1/v1alpha1_suite_test.go similarity index 97% rename from pkg/apis/libvirtproviderconfig/v1alpha1/v1alpha1_suite_test.go rename to pkg/apis/libvirtproviderconfig/v1beta1/v1alpha1_suite_test.go index 40864b891..fa241cdff 100644 --- a/pkg/apis/libvirtproviderconfig/v1alpha1/v1alpha1_suite_test.go +++ b/pkg/apis/libvirtproviderconfig/v1beta1/v1alpha1_suite_test.go @@ -1,4 +1,4 @@ -package v1alpha1 +package v1beta1 import ( "log" diff --git a/pkg/apis/libvirtproviderconfig/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/libvirtproviderconfig/v1beta1/zz_generated.deepcopy.go similarity index 82% rename from pkg/apis/libvirtproviderconfig/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/libvirtproviderconfig/v1beta1/zz_generated.deepcopy.go index ec9d7d02c..d0d0e4158 100644 --- a/pkg/apis/libvirtproviderconfig/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/libvirtproviderconfig/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,24 @@ // +build !ignore_autogenerated -// Code generated by deepcopy-gen. DO NOT EDIT. -package v1alpha1 +/* +Copyright 2019 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. +*/ + +// Code generated by main. DO NOT EDIT. + +package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" @@ -23,6 +40,22 @@ func (in *CloudInit) DeepCopy() *CloudInit { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Ignition) DeepCopyInto(out *Ignition) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Ignition. +func (in *Ignition) DeepCopy() *Ignition { + if in == nil { + return nil + } + out := new(Ignition) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LibvirtClusterProviderConfig) DeepCopyInto(out *LibvirtClusterProviderConfig) { *out = *in @@ -95,23 +128,20 @@ func (in *LibvirtMachineProviderCondition) DeepCopy() *LibvirtMachineProviderCon func (in *LibvirtMachineProviderConfig) DeepCopyInto(out *LibvirtMachineProviderConfig) { *out = *in out.TypeMeta = in.TypeMeta + if in.Ignition != nil { + in, out := &in.Ignition, &out.Ignition + *out = new(Ignition) + **out = **in + } if in.CloudInit != nil { in, out := &in.CloudInit, &out.CloudInit - if *in == nil { - *out = nil - } else { - *out = new(CloudInit) - **out = **in - } + *out = new(CloudInit) + **out = **in } if in.Volume != nil { in, out := &in.Volume, &out.Volume - if *in == nil { - *out = nil - } else { - *out = new(Volume) - **out = **in - } + *out = new(Volume) + **out = **in } return } @@ -173,26 +203,20 @@ func (in *LibvirtMachineProviderStatus) DeepCopyInto(out *LibvirtMachineProvider out.TypeMeta = in.TypeMeta if in.InstanceID != nil { in, out := &in.InstanceID, &out.InstanceID - if *in == nil { - *out = nil - } else { - *out = new(string) - **out = **in - } + *out = new(string) + **out = **in } if in.InstanceState != nil { in, out := &in.InstanceState, &out.InstanceState - if *in == nil { - *out = nil - } else { - *out = new(string) - **out = **in - } + *out = new(string) + **out = **in } if in.Conditions != nil { in, out := &in.Conditions, &out.Conditions *out = make([]LibvirtMachineProviderCondition, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } return } diff --git a/pkg/cloud/libvirt/actuators/machine/actuator.go b/pkg/cloud/libvirt/actuators/machine/actuator.go index 853673dce..fa884cf86 100644 --- a/pkg/cloud/libvirt/actuators/machine/actuator.go +++ b/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" diff --git a/pkg/cloud/libvirt/actuators/machine/actuator_test.go b/pkg/cloud/libvirt/actuators/machine/actuator_test.go index 8813a3f87..fa2816137 100644 --- a/pkg/cloud/libvirt/actuators/machine/actuator_test.go +++ b/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" diff --git a/pkg/cloud/libvirt/actuators/machine/stubs.go b/pkg/cloud/libvirt/actuators/machine/stubs.go index 75f0db778..8835aac28 100644 --- a/pkg/cloud/libvirt/actuators/machine/stubs.go +++ b/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" ) diff --git a/pkg/cloud/libvirt/client/client.go b/pkg/cloud/libvirt/client/client.go index c3e5ce927..28970f2eb 100644 --- a/pkg/cloud/libvirt/client/client.go +++ b/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" ) diff --git a/pkg/cloud/libvirt/client/cloudinit.go b/pkg/cloud/libvirt/client/cloudinit.go index e8ace3331..1bd814eef 100644 --- a/pkg/cloud/libvirt/client/cloudinit.go +++ b/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 { diff --git a/pkg/cloud/libvirt/client/ignition.go b/pkg/cloud/libvirt/client/ignition.go index 9f688cc89..a143a31d5 100644 --- a/pkg/cloud/libvirt/client/ignition.go +++ b/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 { diff --git a/pkg/cloud/libvirt/client/mock/client_generated.go b/pkg/cloud/libvirt/client/mock/client_generated.go index 251a6fc05..054750cc7 100644 --- a/pkg/cloud/libvirt/client/mock/client_generated.go +++ b/pkg/cloud/libvirt/client/mock/client_generated.go @@ -36,7 +36,6 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { // Close mocks base method func (m *MockClient) Close() error { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Close") ret0, _ := ret[0].(error) return ret0 @@ -44,13 +43,11 @@ func (m *MockClient) Close() error { // Close indicates an expected call of Close func (mr *MockClientMockRecorder) Close() *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockClient)(nil).Close)) } // CreateDomain mocks base method func (m *MockClient) CreateDomain(arg0 client.CreateDomainInput) error { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateDomain", arg0) ret0, _ := ret[0].(error) return ret0 @@ -58,13 +55,11 @@ func (m *MockClient) CreateDomain(arg0 client.CreateDomainInput) error { // CreateDomain indicates an expected call of CreateDomain func (mr *MockClientMockRecorder) CreateDomain(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateDomain", reflect.TypeOf((*MockClient)(nil).CreateDomain), arg0) } // DeleteDomain mocks base method func (m *MockClient) DeleteDomain(name string) error { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteDomain", name) ret0, _ := ret[0].(error) return ret0 @@ -72,13 +67,11 @@ func (m *MockClient) DeleteDomain(name string) error { // DeleteDomain indicates an expected call of DeleteDomain func (mr *MockClientMockRecorder) DeleteDomain(name interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDomain", reflect.TypeOf((*MockClient)(nil).DeleteDomain), name) } // DomainExists mocks base method func (m *MockClient) DomainExists(name string) (bool, error) { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DomainExists", name) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) @@ -87,13 +80,11 @@ func (m *MockClient) DomainExists(name string) (bool, error) { // DomainExists indicates an expected call of DomainExists func (mr *MockClientMockRecorder) DomainExists(name interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DomainExists", reflect.TypeOf((*MockClient)(nil).DomainExists), name) } // LookupDomainByName mocks base method func (m *MockClient) LookupDomainByName(name string) (*libvirt_go.Domain, error) { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LookupDomainByName", name) ret0, _ := ret[0].(*libvirt_go.Domain) ret1, _ := ret[1].(error) @@ -102,13 +93,11 @@ func (m *MockClient) LookupDomainByName(name string) (*libvirt_go.Domain, error) // LookupDomainByName indicates an expected call of LookupDomainByName func (mr *MockClientMockRecorder) LookupDomainByName(name interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LookupDomainByName", reflect.TypeOf((*MockClient)(nil).LookupDomainByName), name) } // CreateVolume mocks base method func (m *MockClient) CreateVolume(arg0 client.CreateVolumeInput) error { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateVolume", arg0) ret0, _ := ret[0].(error) return ret0 @@ -116,13 +105,11 @@ func (m *MockClient) CreateVolume(arg0 client.CreateVolumeInput) error { // CreateVolume indicates an expected call of CreateVolume func (mr *MockClientMockRecorder) CreateVolume(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateVolume", reflect.TypeOf((*MockClient)(nil).CreateVolume), arg0) } // VolumeExists mocks base method func (m *MockClient) VolumeExists(name string) (bool, error) { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "VolumeExists", name) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) @@ -131,13 +118,11 @@ func (m *MockClient) VolumeExists(name string) (bool, error) { // VolumeExists indicates an expected call of VolumeExists func (mr *MockClientMockRecorder) VolumeExists(name interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VolumeExists", reflect.TypeOf((*MockClient)(nil).VolumeExists), name) } // DeleteVolume mocks base method func (m *MockClient) DeleteVolume(name string) error { - m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteVolume", name) ret0, _ := ret[0].(error) return ret0 @@ -145,6 +130,5 @@ func (m *MockClient) DeleteVolume(name string) error { // DeleteVolume indicates an expected call of DeleteVolume func (mr *MockClientMockRecorder) DeleteVolume(name interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteVolume", reflect.TypeOf((*MockClient)(nil).DeleteVolume), name) } diff --git a/test/utils/manifests.go b/test/utils/manifests.go index 99393c21d..05933b261 100644 --- a/test/utils/manifests.go +++ b/test/utils/manifests.go @@ -3,7 +3,7 @@ package utils import ( "fmt" - 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" )