From 12a6a0d0fe7e0c04cfef3ca15552b4ef0b95f25c Mon Sep 17 00:00:00 2001 From: Francesco Cheinasso Date: Tue, 19 Sep 2023 16:32:05 +0200 Subject: [PATCH] Bump controller-gen version from 0.9.2 to 0.13.0 --- Makefile | 4 ++-- apis/discovery/v1alpha1/zz_generated.deepcopy.go | 1 - apis/net/v1alpha1/zz_generated.deepcopy.go | 4 ++-- apis/offloading/v1alpha1/zz_generated.deepcopy.go | 4 ++-- apis/sharing/v1alpha1/zz_generated.deepcopy.go | 1 - apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go | 1 - deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml | 3 +-- deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml | 3 +-- deployments/liqo/crds/net.liqo.io_ipamstorages.yaml | 3 +-- deployments/liqo/crds/net.liqo.io_natmappings.yaml | 3 +-- deployments/liqo/crds/net.liqo.io_networkconfigs.yaml | 3 +-- deployments/liqo/crds/net.liqo.io_tunnelendpoints.yaml | 3 +-- .../liqo/crds/offloading.liqo.io_namespaceoffloadings.yaml | 3 +-- deployments/liqo/crds/sharing.liqo.io_resourceoffers.yaml | 3 +-- .../liqo/crds/virtualkubelet.liqo.io_namespacemaps.yaml | 3 +-- .../crds/virtualkubelet.liqo.io_shadowendpointslices.yaml | 3 +-- deployments/liqo/crds/virtualkubelet.liqo.io_shadowpods.yaml | 3 +-- .../liqo/crds/virtualkubelet.liqo.io_virtualnodes.yaml | 3 +-- 18 files changed, 18 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index 8f94b5bb6f..f421868704 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ purge: manifests ctl # Generate manifests e.g. CRD, RBAC etc. manifests: controller-gen rm -f deployments/liqo/crds/* - $(CONTROLLER_GEN) crd paths="./apis/..." crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=deployments/liqo/crds + $(CONTROLLER_GEN) paths="./apis/..." crd:generateEmbeddedObjectMeta=true output:crd:artifacts:config=deployments/liqo/crds #Generate RBAC for each controller rbacs: controller-gen @@ -169,7 +169,7 @@ PROTOC=$(shell which protoc) # download controller-gen if necessary controller-gen: ifeq (, $(shell which controller-gen)) - @go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 + @go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 CONTROLLER_GEN=$(GOBIN)/controller-gen else CONTROLLER_GEN=$(shell which controller-gen) diff --git a/apis/discovery/v1alpha1/zz_generated.deepcopy.go b/apis/discovery/v1alpha1/zz_generated.deepcopy.go index 3630a9eb3e..0e8ebb343d 100644 --- a/apis/discovery/v1alpha1/zz_generated.deepcopy.go +++ b/apis/discovery/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright 2019-2023 The Liqo Authors // diff --git a/apis/net/v1alpha1/zz_generated.deepcopy.go b/apis/net/v1alpha1/zz_generated.deepcopy.go index 16bf7fc0f0..31d0b2a2f1 100644 --- a/apis/net/v1alpha1/zz_generated.deepcopy.go +++ b/apis/net/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright 2019-2023 The Liqo Authors // @@ -125,7 +124,8 @@ func (in *IpamSpec) DeepCopyInto(out *IpamSpec) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make([]byte, len(*in)) copy(*out, *in) } diff --git a/apis/offloading/v1alpha1/zz_generated.deepcopy.go b/apis/offloading/v1alpha1/zz_generated.deepcopy.go index 7e7b796451..813657a8c5 100644 --- a/apis/offloading/v1alpha1/zz_generated.deepcopy.go +++ b/apis/offloading/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright 2019-2023 The Liqo Authors // @@ -109,7 +108,8 @@ func (in *NamespaceOffloadingStatus) DeepCopyInto(out *NamespaceOffloadingStatus if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(RemoteNamespaceConditions, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) diff --git a/apis/sharing/v1alpha1/zz_generated.deepcopy.go b/apis/sharing/v1alpha1/zz_generated.deepcopy.go index 80ac336702..0d93152946 100644 --- a/apis/sharing/v1alpha1/zz_generated.deepcopy.go +++ b/apis/sharing/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright 2019-2023 The Liqo Authors // diff --git a/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go b/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go index 8a38134a7e..ddfc752a1d 100644 --- a/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go +++ b/apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated // Copyright 2019-2023 The Liqo Authors // diff --git a/deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml b/deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml index b2432ec7be..fbea410db3 100644 --- a/deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml +++ b/deployments/liqo/crds/discovery.liqo.io_foreignclusters.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: foreignclusters.discovery.liqo.io spec: group: discovery.liqo.io diff --git a/deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml b/deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml index 21a73dc1ff..1e240724d0 100644 --- a/deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml +++ b/deployments/liqo/crds/discovery.liqo.io_resourcerequests.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: resourcerequests.discovery.liqo.io spec: group: discovery.liqo.io diff --git a/deployments/liqo/crds/net.liqo.io_ipamstorages.yaml b/deployments/liqo/crds/net.liqo.io_ipamstorages.yaml index 1c3c5004aa..7b870c91fb 100644 --- a/deployments/liqo/crds/net.liqo.io_ipamstorages.yaml +++ b/deployments/liqo/crds/net.liqo.io_ipamstorages.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: ipamstorages.net.liqo.io spec: group: net.liqo.io diff --git a/deployments/liqo/crds/net.liqo.io_natmappings.yaml b/deployments/liqo/crds/net.liqo.io_natmappings.yaml index 6f178fbc7e..559fa58384 100644 --- a/deployments/liqo/crds/net.liqo.io_natmappings.yaml +++ b/deployments/liqo/crds/net.liqo.io_natmappings.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: natmappings.net.liqo.io spec: group: net.liqo.io diff --git a/deployments/liqo/crds/net.liqo.io_networkconfigs.yaml b/deployments/liqo/crds/net.liqo.io_networkconfigs.yaml index b46084d002..721ac85949 100644 --- a/deployments/liqo/crds/net.liqo.io_networkconfigs.yaml +++ b/deployments/liqo/crds/net.liqo.io_networkconfigs.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: networkconfigs.net.liqo.io spec: group: net.liqo.io diff --git a/deployments/liqo/crds/net.liqo.io_tunnelendpoints.yaml b/deployments/liqo/crds/net.liqo.io_tunnelendpoints.yaml index 0da7ca882f..8b325010b7 100644 --- a/deployments/liqo/crds/net.liqo.io_tunnelendpoints.yaml +++ b/deployments/liqo/crds/net.liqo.io_tunnelendpoints.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: tunnelendpoints.net.liqo.io spec: group: net.liqo.io diff --git a/deployments/liqo/crds/offloading.liqo.io_namespaceoffloadings.yaml b/deployments/liqo/crds/offloading.liqo.io_namespaceoffloadings.yaml index 2ef225f89e..c9cd8975ea 100644 --- a/deployments/liqo/crds/offloading.liqo.io_namespaceoffloadings.yaml +++ b/deployments/liqo/crds/offloading.liqo.io_namespaceoffloadings.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: namespaceoffloadings.offloading.liqo.io spec: group: offloading.liqo.io diff --git a/deployments/liqo/crds/sharing.liqo.io_resourceoffers.yaml b/deployments/liqo/crds/sharing.liqo.io_resourceoffers.yaml index f7d2b5ed41..dae78c74e4 100644 --- a/deployments/liqo/crds/sharing.liqo.io_resourceoffers.yaml +++ b/deployments/liqo/crds/sharing.liqo.io_resourceoffers.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: resourceoffers.sharing.liqo.io spec: group: sharing.liqo.io diff --git a/deployments/liqo/crds/virtualkubelet.liqo.io_namespacemaps.yaml b/deployments/liqo/crds/virtualkubelet.liqo.io_namespacemaps.yaml index 75e5e9993b..b662046e6c 100644 --- a/deployments/liqo/crds/virtualkubelet.liqo.io_namespacemaps.yaml +++ b/deployments/liqo/crds/virtualkubelet.liqo.io_namespacemaps.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: namespacemaps.virtualkubelet.liqo.io spec: group: virtualkubelet.liqo.io diff --git a/deployments/liqo/crds/virtualkubelet.liqo.io_shadowendpointslices.yaml b/deployments/liqo/crds/virtualkubelet.liqo.io_shadowendpointslices.yaml index bca6ae6d53..999ea4c229 100644 --- a/deployments/liqo/crds/virtualkubelet.liqo.io_shadowendpointslices.yaml +++ b/deployments/liqo/crds/virtualkubelet.liqo.io_shadowendpointslices.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: shadowendpointslices.virtualkubelet.liqo.io spec: group: virtualkubelet.liqo.io diff --git a/deployments/liqo/crds/virtualkubelet.liqo.io_shadowpods.yaml b/deployments/liqo/crds/virtualkubelet.liqo.io_shadowpods.yaml index d3385d8b41..38e20ef13a 100644 --- a/deployments/liqo/crds/virtualkubelet.liqo.io_shadowpods.yaml +++ b/deployments/liqo/crds/virtualkubelet.liqo.io_shadowpods.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: shadowpods.virtualkubelet.liqo.io spec: group: virtualkubelet.liqo.io diff --git a/deployments/liqo/crds/virtualkubelet.liqo.io_virtualnodes.yaml b/deployments/liqo/crds/virtualkubelet.liqo.io_virtualnodes.yaml index 0877602f70..10d3eeda0a 100644 --- a/deployments/liqo/crds/virtualkubelet.liqo.io_virtualnodes.yaml +++ b/deployments/liqo/crds/virtualkubelet.liqo.io_virtualnodes.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: virtualnodes.virtualkubelet.liqo.io spec: group: virtualkubelet.liqo.io