From d983eaee20f1669738c34a6e7d9cfd9525c80a72 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 8 Feb 2019 17:47:21 -0800 Subject: [PATCH] vendor: Bump cluster-API providers And shift the AWS provider's commit to land after they fixed registration [1] and also after their pivot to v1beta1 [2] (because 3a125a69, Change awsproviderconfig.k8s.io/v1alpha1 API version to awsproviderconfig.openshift.io/v1beta1, 2019-02-11, #1223 already started us along that pivot). Generated (after the Gopkg.toml bump) with: $ dep ensure using: $ dep version dep: version : v0.5.0-31-g73b3afe build date : 2019-02-08 git hash : 73b3afe go version : go1.10.3 go compiler : gc platform : linux/amd64 features : ImportDuringSolve=false [1]: https://github.com/openshift/cluster-api-provider-aws/pull/149 [2]: https://github.com/openshift/cluster-api-provider-aws/pull/152 --- Gopkg.lock | 29 ++++++++++---- Gopkg.toml | 2 +- ...toscheme_libvirtproviderconfig_v1alpha1.go | 10 +++++ .../pkg/apis/apis.go | 17 ++++++++ ...ddtoscheme_openshiftawsprovider_v1beta1.go | 26 +++++++++++++ .../cluster-api-provider-aws/pkg/apis/apis.go | 33 ++++++++++++++++ .../awsmachineproviderconfig_types.go | 2 +- .../{v1alpha1 => v1beta1}/doc.go | 6 +-- .../{v1alpha1 => v1beta1}/register.go | 22 +++++++---- .../zz_generated.deepcopy.go | 5 ++- .../pkg/apis/apis.go | 39 +++++++++++++++++++ 11 files changed, 169 insertions(+), 22 deletions(-) create mode 100644 vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go create mode 100644 vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/apis.go create mode 100644 vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/addtoscheme_openshiftawsprovider_v1beta1.go create mode 100644 vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/apis.go rename vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/{v1alpha1 => v1beta1}/awsmachineproviderconfig_types.go (99%) rename vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/{v1alpha1 => v1beta1}/doc.go (82%) rename vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/{v1alpha1 => v1beta1}/register.go (83%) rename vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/{v1alpha1 => v1beta1}/zz_generated.deepcopy.go (99%) create mode 100644 vendor/sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/apis.go diff --git a/Gopkg.lock b/Gopkg.lock index bdbdb991ff3..96cd3e974c5 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -406,9 +406,12 @@ revision = "91fca585a85b163ddfd119fd09c128c9feadddca" [[projects]] - digest = "1:46e54b01e18842945bd92e687a237d891fbc5ee3224f460eb47b55454837862f" + digest = "1:64f129e3a0f9d8419e57ab6b65cceedc136d6dc5bcd9398545890bd4217bf6f2" name = "github.com/openshift/cluster-api-provider-libvirt" - packages = ["pkg/apis/libvirtproviderconfig/v1alpha1"] + packages = [ + "pkg/apis", + "pkg/apis/libvirtproviderconfig/v1alpha1", + ] pruneopts = "NUT" revision = "c23986b36a2521cd69ac22d7adb74a22bca9f7aa" @@ -847,18 +850,24 @@ revision = "ef6f8fc12d32fc1646f231f6e39dbef59ad2e4dd" [[projects]] - digest = "1:b03dcb1c1d57b36333b0fa402ea776f65ba3b25afce00049fe6497f047aa56f6" + digest = "1:3981a97e1e569cbbaaab702d2b44adfac402e923a2bb0984ef5fad93bcbf8c79" name = "sigs.k8s.io/cluster-api-provider-aws" - packages = ["pkg/apis/awsproviderconfig/v1alpha1"] + packages = [ + "pkg/apis", + "pkg/apis/awsproviderconfig/v1beta1", + ] pruneopts = "NUT" - revision = "9a983a5c6c12b27169c57e4c8948cb554e4d6b6c" + revision = "15fe4b4ea5636f8516c238490fc6a85d44161181" source = "https://github.com/openshift/cluster-api-provider-aws.git" [[projects]] branch = "master" - digest = "1:fcc276bfa3e1e3f8bda1249073912cebf9373996d24a9ffe988ad284c1cf65e3" + digest = "1:53e688169eb9b22a6a6d1d69f8987e85331bb185e3f3691ef4182e18f6bdd3a0" name = "sigs.k8s.io/cluster-api-provider-openstack" - packages = ["pkg/apis/openstackproviderconfig/v1alpha1"] + packages = [ + "pkg/apis", + "pkg/apis/openstackproviderconfig/v1alpha1", + ] pruneopts = "NUT" revision = "581696acc2e79f9cc1755a9cb1d8b6d512298883" source = "https://github.com/openshift/cluster-api-provider-openstack.git" @@ -925,6 +934,7 @@ "github.com/openshift/api/config/v1", "github.com/openshift/client-go/config/clientset/versioned", "github.com/openshift/client-go/route/clientset/versioned", + "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/pkg/apis/machine/v1beta1", "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers", @@ -948,6 +958,7 @@ "k8s.io/apimachinery/pkg/apis/meta/v1", "k8s.io/apimachinery/pkg/fields", "k8s.io/apimachinery/pkg/runtime", + "k8s.io/apimachinery/pkg/runtime/serializer", "k8s.io/apimachinery/pkg/util/errors", "k8s.io/apimachinery/pkg/util/sets", "k8s.io/apimachinery/pkg/util/validation", @@ -961,7 +972,9 @@ "k8s.io/client-go/tools/clientcmd/api/v1", "k8s.io/client-go/tools/watch", "k8s.io/utils/pointer", - "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1", + "sigs.k8s.io/cluster-api-provider-aws/pkg/apis", + "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1", + "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis", "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1", "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1", ] diff --git a/Gopkg.toml b/Gopkg.toml index a1e38a906d1..ec8c9133726 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -59,7 +59,7 @@ ignored = [ [[constraint]] name = "sigs.k8s.io/cluster-api-provider-aws" source = "https://github.com/openshift/cluster-api-provider-aws.git" - revision = "9a983a5c6c12b27169c57e4c8948cb554e4d6b6c" + revision = "15fe4b4ea5636f8516c238490fc6a85d44161181" [[constraint]] name = "github.com/openshift/cluster-api-provider-libvirt" diff --git a/vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go b/vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go new file mode 100644 index 00000000000..d6e363c0c8a --- /dev/null +++ b/vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/addtoscheme_libvirtproviderconfig_v1alpha1.go @@ -0,0 +1,10 @@ +package apis + +import ( + "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1" +) + +func init() { + // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back + AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme) +} diff --git a/vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/apis.go b/vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/apis.go new file mode 100644 index 00000000000..d2d5b47ccc9 --- /dev/null +++ b/vendor/github.com/openshift/cluster-api-provider-libvirt/pkg/apis/apis.go @@ -0,0 +1,17 @@ +// Generate deepcopy for apis +//go:generate go run ../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate.go.txt + +// Package apis contains Kubernetes API groups. +package apis + +import ( + "k8s.io/apimachinery/pkg/runtime" +) + +// AddToSchemes may be used to add all resources defined in the project to a Scheme +var AddToSchemes runtime.SchemeBuilder + +// AddToScheme adds all Resources to the Scheme +func AddToScheme(s *runtime.Scheme) error { + return AddToSchemes.AddToScheme(s) +} diff --git a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/addtoscheme_openshiftawsprovider_v1beta1.go b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/addtoscheme_openshiftawsprovider_v1beta1.go new file mode 100644 index 00000000000..cf53260c4e8 --- /dev/null +++ b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/addtoscheme_openshiftawsprovider_v1beta1.go @@ -0,0 +1,26 @@ +/* +Copyright 2018 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. +*/ + +package apis + +import ( + "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1" +) + +func init() { + // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back + AddToSchemes = append(AddToSchemes, v1beta1.SchemeBuilder.AddToScheme) +} diff --git a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/apis.go b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/apis.go new file mode 100644 index 00000000000..e951fcc6f1c --- /dev/null +++ b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/apis.go @@ -0,0 +1,33 @@ +/* +Copyright 2018 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. +*/ + +// Generate deepcopy for apis +//go:generate go run ../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate/boilerplate.go.txt + +// Package apis contains Kubernetes API groups. +package apis + +import ( + "k8s.io/apimachinery/pkg/runtime" +) + +// AddToSchemes may be used to add all resources defined in the project to a Scheme +var AddToSchemes runtime.SchemeBuilder + +// AddToScheme adds all Resources to the Scheme +func AddToScheme(s *runtime.Scheme) error { + return AddToSchemes.AddToScheme(s) +} diff --git a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/awsmachineproviderconfig_types.go b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/awsmachineproviderconfig_types.go similarity index 99% rename from vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/awsmachineproviderconfig_types.go rename to vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/awsmachineproviderconfig_types.go index a826bb26a44..8e8b551ca24 100644 --- a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/awsmachineproviderconfig_types.go +++ b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/awsmachineproviderconfig_types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( corev1 "k8s.io/api/core/v1" diff --git a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/doc.go b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/doc.go similarity index 82% rename from vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/doc.go rename to vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/doc.go index c391550798a..b23498c7386 100644 --- a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/doc.go +++ b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/doc.go @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package v1alpha1 contains API Schema definitions for the awsproviderconfig v1alpha1 API group +// Package v1beta1 contains API Schema definitions for the awsproviderconfig v1beta1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig // +k8s:defaulter-gen=TypeMeta -// +groupName=awsproviderconfig.k8s.io -package v1alpha1 +// +groupName=awsproviderconfig.openshift.io +package v1beta1 diff --git a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/register.go b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/register.go similarity index 83% rename from vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/register.go rename to vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/register.go index 1217f5baa8b..97854315417 100644 --- a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/register.go +++ b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/register.go @@ -16,18 +16,20 @@ limitations under the License. // NOTE: Boilerplate only. Ignore this file. -// Package v1alpha1 contains API Schema definitions for the awsproviderconfig v1alpha1 API group +// Package v1beta1 contains API Schema definitions for the awsproviderconfig v1beta1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register // +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig // +k8s:defaulter-gen=TypeMeta // +groupName=awsproviderconfig.k8s.io -package v1alpha1 +package v1beta1 import ( "bytes" "fmt" + "github.com/ghodss/yaml" + machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -37,7 +39,7 @@ import ( var ( // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "awsproviderconfig.k8s.io", Version: "v1alpha1"} + SchemeGroupVersion = schema.GroupVersion{Group: "awsproviderconfig.openshift.io", Version: "v1beta1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} @@ -76,8 +78,11 @@ func NewCodec() (*AWSProviderConfigCodec, error) { // DecodeProviderSpec deserialises an object from the provider config func (codec *AWSProviderConfigCodec) DecodeProviderSpec(providerSpec *machinev1.ProviderSpec, out runtime.Object) error { if providerSpec.Value != nil { - _, _, err := codec.decoder.Decode(providerSpec.Value.Raw, nil, out) - if err != nil { + // TODO(vikasc): revert back to using `Decode` once installer and mao have started using + // awsprovider apis pivoted under openshift.io api group + // _, _, err := codec.decoder.Decode(providerSpec.Value.Raw, nil, out) + // if err != nil { + if err := yaml.Unmarshal(providerSpec.Value.Raw, out); err != nil { return fmt.Errorf("decoding failure: %v", err) } } @@ -107,8 +112,11 @@ func (codec *AWSProviderConfigCodec) EncodeProviderStatus(in runtime.Object) (*r // DecodeProviderStatus deserialises the provider status func (codec *AWSProviderConfigCodec) DecodeProviderStatus(providerStatus *runtime.RawExtension, out runtime.Object) error { if providerStatus != nil { - _, _, err := codec.decoder.Decode(providerStatus.Raw, nil, out) - if err != nil { + // TODO(vikasc): revert back to using `Decode` once installer and mao have started using + // awsprovider apis pivoted under openshift.io api group + //_, _, err := codec.decoder.Decode(providerStatus.Raw, nil, out) + if err := yaml.Unmarshal(providerStatus.Raw, out); err != nil { + return fmt.Errorf("decoding failure: %v", err) } } diff --git a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/zz_generated.deepcopy.go b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/zz_generated.deepcopy.go similarity index 99% rename from vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/zz_generated.deepcopy.go rename to vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/zz_generated.deepcopy.go index 5af190171bc..eae74a6ea98 100644 --- a/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsproviderconfig/v1beta1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ // +build !ignore_autogenerated /* -Copyright 2018 The Kubernetes Authors. +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. @@ -15,9 +15,10 @@ 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 v1alpha1 +package v1beta1 import ( v1 "k8s.io/api/core/v1" diff --git a/vendor/sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/apis.go b/vendor/sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/apis.go new file mode 100644 index 00000000000..99c9b2b6a73 --- /dev/null +++ b/vendor/sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/apis.go @@ -0,0 +1,39 @@ +/* +Copyright 2018 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. +*/ + +// Generate deepcopy for apis +//go:generate go run ../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate.go.txt + +// Package apis contains Kubernetes API groups. +package apis + +import ( + "k8s.io/apimachinery/pkg/runtime" + "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1" +) + +// AddToSchemes may be used to add all resources defined in the project to a Scheme +var AddToSchemes runtime.SchemeBuilder + +func init() { + // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back + AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme) +} + +// AddToScheme adds all Resources to the Scheme +func AddToScheme(s *runtime.Scheme) error { + return AddToSchemes.AddToScheme(s) +}