From a18574d6a6287eadcede8b4fd91b8dd53cd40b27 Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Thu, 17 Oct 2024 16:47:21 -0400 Subject: [PATCH 1/2] pin dependencies to versions for go 1.21 and remove update flag Signed-off-by: Jordan Dubrick --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d35ab40..eb08e97 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,10 +50,10 @@ jobs: fi - name: Check format run: | - go get -u github.com/google/addlicense@dc31ac9ffcca99c9457226366135701794b128c0 - go install github.com/google/addlicense@dc31ac9ffcca99c9457226366135701794b128c0 - go get -u golang.org/x/tools/cmd/goimports@0cc407e63f5fdd71499c32afa4c54382c5b48d71 - go install golang.org/x/tools/cmd/goimports@0cc407e63f5fdd71499c32afa4c54382c5b48d71 + go get github.com/google/addlicense@v1.1.1 + go install github.com/google/addlicense@v1.1.1 + go get golang.org/x/tools/cmd/goimports@v0.24.0 + go install golang.org/x/tools/cmd/goimports@v0.24.0 git reset HEAD --hard make fmt From d385824a0e3472512ab40c153dd3cef0c890b0d1 Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Wed, 23 Oct 2024 14:15:58 -0400 Subject: [PATCH 2/2] bump controller-gen to 0.14.0 Signed-off-by: Jordan Dubrick --- Makefile | 2 +- README.md | 2 +- .../registry.devfile.io_clusterdevfileregistrieslists.yaml | 2 +- bundle/manifests/registry.devfile.io_devfileregistries.yaml | 2 +- .../manifests/registry.devfile.io_devfileregistrieslists.yaml | 2 +- .../registry.devfile.io_clusterdevfileregistrieslists.yaml | 2 +- config/crd/bases/registry.devfile.io_devfileregistries.yaml | 2 +- .../crd/bases/registry.devfile.io_devfileregistrieslists.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c3f45b7..dd1ac06 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ ENVTEST_VERSION=v0.0.0-20240405143037-c25fe2f5ca0f # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.26 # Controller tools version number -CONTROLLER_TOOLS_VERSION ?= v0.9.2 +CONTROLLER_TOOLS_VERSION ?= v0.14.0 # Kustomize version number KUSTOMIZE_VERSION ?= v3.8.7 diff --git a/README.md b/README.md index 2ceed32..d234636 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ The repository contains a Makefile; building and deploying can be configured via | `BUNDLE_CHANNELS` | Sets the list channel(s) include bundle build under | `alpha` | | `BUNDLE_DEFAULT_CHANNEL` | Sets the default channel to use when installing the bundle | | | `ENVTEST_K8S_VERSION` | Version of k8s to use for the test environment | `1.26` (current) | -| `CONTROLLER_TOOLS_VERSION` | Version of the controller tools | `v0.9.2` | +| `CONTROLLER_TOOLS_VERSION` | Version of the controller tools | `v0.14.0` | | `KUSTOMIZE_VERSION` | Version of kustomize | `v3.8.7` | | `GOBIN` | Path to install Go binaries to | `${GOPATH}/bin` | | `K8S_CLI` | Path to CLI tool to use with the target cluster environment, `kubectl` or `oc` | Either `oc` or `kubectl` if installed in that order | diff --git a/bundle/manifests/registry.devfile.io_clusterdevfileregistrieslists.yaml b/bundle/manifests/registry.devfile.io_clusterdevfileregistrieslists.yaml index b86c06e..af7c3b2 100644 --- a/bundle/manifests/registry.devfile.io_clusterdevfileregistrieslists.yaml +++ b/bundle/manifests/registry.devfile.io_clusterdevfileregistrieslists.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: registry-operator-system/registry-operator-serving-cert - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: clusterdevfileregistrieslists.registry.devfile.io spec: diff --git a/bundle/manifests/registry.devfile.io_devfileregistries.yaml b/bundle/manifests/registry.devfile.io_devfileregistries.yaml index 1a81267..8562058 100644 --- a/bundle/manifests/registry.devfile.io_devfileregistries.yaml +++ b/bundle/manifests/registry.devfile.io_devfileregistries.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: devfileregistries.registry.devfile.io spec: diff --git a/bundle/manifests/registry.devfile.io_devfileregistrieslists.yaml b/bundle/manifests/registry.devfile.io_devfileregistrieslists.yaml index c5ae6c5..0bc6797 100644 --- a/bundle/manifests/registry.devfile.io_devfileregistrieslists.yaml +++ b/bundle/manifests/registry.devfile.io_devfileregistrieslists.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: registry-operator-system/registry-operator-serving-cert - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: devfileregistrieslists.registry.devfile.io spec: diff --git a/config/crd/bases/registry.devfile.io_clusterdevfileregistrieslists.yaml b/config/crd/bases/registry.devfile.io_clusterdevfileregistrieslists.yaml index ac597b0..783e5a5 100644 --- a/config/crd/bases/registry.devfile.io_clusterdevfileregistrieslists.yaml +++ b/config/crd/bases/registry.devfile.io_clusterdevfileregistrieslists.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: clusterdevfileregistrieslists.registry.devfile.io spec: diff --git a/config/crd/bases/registry.devfile.io_devfileregistries.yaml b/config/crd/bases/registry.devfile.io_devfileregistries.yaml index 140e808..e8607dd 100644 --- a/config/crd/bases/registry.devfile.io_devfileregistries.yaml +++ b/config/crd/bases/registry.devfile.io_devfileregistries.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: devfileregistries.registry.devfile.io spec: diff --git a/config/crd/bases/registry.devfile.io_devfileregistrieslists.yaml b/config/crd/bases/registry.devfile.io_devfileregistrieslists.yaml index 10bd0ae..8fc80a3 100644 --- a/config/crd/bases/registry.devfile.io_devfileregistrieslists.yaml +++ b/config/crd/bases/registry.devfile.io_devfileregistrieslists.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.9.2 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: devfileregistrieslists.registry.devfile.io spec: