From 24e416069abc12cf9bb659131b35f411d3c979ce Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 11 Aug 2022 12:40:40 -0600 Subject: [PATCH] core: update controller runtime to v0.6.2 The dependencies in controller runtim v0.5 were getting old and causing go module issues on macos. Now with the update to v0.6.2 the module dependency issue is solved. For another day we should update the controller runtime to even newer. Signed-off-by: Travis Nielsen --- .github/workflows/build.yml | 7 +++- Makefile | 2 +- .../charts/rook-ceph/templates/resources.yaml | 32 +++++++++---------- deploy/examples/crds.yaml | 32 +++++++++---------- 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 931fad717..307a419ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,13 +29,18 @@ jobs: with: go-version: 1.19 + - name: Set up Helm + uses: azure/setup-helm@v1 + with: + version: v3.6.2 + - name: copy working directory to GOPATH run: sudo mkdir -p /Users/runner/go/src/github.com && sudo cp -a /Users/runner/work/rook /Users/runner/go/src/github.com/ - name: build rook working-directory: /Users/runner/go/src/github.com/rook/rook run: | - GOPATH=$(go env GOPATH) make clean && go get -u golang.org/x/sys && make -j$nproc IMAGES='ceph' BUILD_CONTAINER_IMAGE=false build + GOPATH=$(go env GOPATH) make clean && make -j$nproc IMAGES='ceph' BUILD_CONTAINER_IMAGE=false build - name: validate build working-directory: /Users/runner/go/src/github.com/rook/rook diff --git a/Makefile b/Makefile index 09583851b..d8cdaf692 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ all: build # Controller-gen version # f284e2e8... is master ahead of v0.5.0 which has ability to generate embedded objectmeta in CRDs -CONTROLLER_GEN_VERSION=f284e2e8098cb0193c2b0c7c1c651ae75496539b +CONTROLLER_GEN_VERSION=v0.6.2 # Set GOBIN ifeq (,$(shell go env GOBIN)) diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index 4124c594d..e8db3a3bf 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephblockpoolradosnamespaces.ceph.rook.io @@ -70,7 +70,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephblockpools.ceph.rook.io @@ -460,7 +460,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephbucketnotifications.ceph.rook.io @@ -599,7 +599,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephbuckettopics.ceph.rook.io @@ -754,7 +754,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephclients.ceph.rook.io @@ -833,7 +833,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephclusters.ceph.rook.io @@ -4493,7 +4493,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephfilesystemmirrors.ceph.rook.io @@ -5134,7 +5134,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephfilesystems.ceph.rook.io @@ -6590,7 +6590,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephfilesystemsubvolumegroups.ceph.rook.io @@ -6665,7 +6665,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephnfses.ceph.rook.io @@ -7334,7 +7334,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephobjectrealms.ceph.rook.io @@ -7401,7 +7401,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephobjectstores.ceph.rook.io @@ -8895,7 +8895,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephobjectstoreusers.ceph.rook.io @@ -9040,7 +9040,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephobjectzonegroups.ceph.rook.io @@ -9109,7 +9109,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephobjectzones.ceph.rook.io @@ -9506,7 +9506,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 helm.sh/resource-policy: keep creationTimestamp: null name: cephrbdmirrors.ceph.rook.io diff --git a/deploy/examples/crds.yaml b/deploy/examples/crds.yaml index beff6b54d..a29f2fca0 100644 --- a/deploy/examples/crds.yaml +++ b/deploy/examples/crds.yaml @@ -7,7 +7,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephblockpoolradosnamespaces.ceph.rook.io spec: @@ -73,7 +73,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephblockpools.ceph.rook.io spec: @@ -462,7 +462,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephbucketnotifications.ceph.rook.io spec: @@ -600,7 +600,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephbuckettopics.ceph.rook.io spec: @@ -754,7 +754,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephclients.ceph.rook.io spec: @@ -832,7 +832,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephclusters.ceph.rook.io spec: @@ -4491,7 +4491,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephfilesystemmirrors.ceph.rook.io spec: @@ -5131,7 +5131,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephfilesystems.ceph.rook.io spec: @@ -6586,7 +6586,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephfilesystemsubvolumegroups.ceph.rook.io spec: @@ -6660,7 +6660,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephnfses.ceph.rook.io spec: @@ -7328,7 +7328,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephobjectrealms.ceph.rook.io spec: @@ -7394,7 +7394,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephobjectstores.ceph.rook.io spec: @@ -8887,7 +8887,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephobjectstoreusers.ceph.rook.io spec: @@ -9031,7 +9031,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephobjectzonegroups.ceph.rook.io spec: @@ -9099,7 +9099,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephobjectzones.ceph.rook.io spec: @@ -9495,7 +9495,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.5.1-0.20210420220833-f284e2e8098c + controller-gen.kubebuilder.io/version: v0.6.2 creationTimestamp: null name: cephrbdmirrors.ceph.rook.io spec: