Skip to content

Commit

Permalink
bumping controller-gen in tools to v0.17 and go mod tidy
Browse files Browse the repository at this point in the history
Signed-off-by: Mohamed Belgaied Hassine <[email protected]>
  • Loading branch information
belgaied2 committed Jun 28, 2024
1 parent 0800398 commit 178c952
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: setupGo
uses: actions/setup-go@v5
with:
go-version: '=1.20.11'
go-version: '=1.22.3'
- name: Docker login
uses: docker/login-action@v3
with:
Expand All @@ -48,7 +48,7 @@ jobs:
- name: setupGo
uses: actions/setup-go@v5
with:
go-version: '=1.20.11'
go-version: '=1.22.3'
- name: Update manifests
run: |
make release RELEASE_TAG=${{ env.TAG }} ORG=${{ env.ORG }}
Expand All @@ -63,4 +63,4 @@ jobs:
name: ${{ env.TAG }}
files: |
out/metadata.yaml
out/components.yaml
out/components.yaml
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Options for analysis running.
run:
go: "1.19"
go: "1.22"
skip-files:
- "zz_generated.*\\.go$"
- "vendored_openapi\\.go$"
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENVTEST_K8S_VERSION = 1.26.0
#
# Go.
#
GO_VERSION ?= 1.20.11
GO_VERSION ?= 1.22.3
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)

# Use GOPROXY environment variable if set
Expand Down Expand Up @@ -289,8 +289,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v3.8.7
CONTROLLER_TOOLS_VERSION ?= v0.9.2
KUSTOMIZE_VERSION ?= v5.4.0
CONTROLLER_TOOLS_VERSION ?= v0.17.0
ENVTEST_VERSION ?= v0.0.0-20240531134648-6636df17d67b

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
Expand Down Expand Up @@ -371,4 +371,4 @@ clean-generated-yaml: ## Remove files generated by conversion-gen from the menti
$(GH): # Download GitHub cli into the tools bin folder
hack/ensure-gh.sh \
-b $(TOOLS_BIN_DIR) \
$(GH_VERSION)
$(GH_VERSION)
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/rancher-sandbox/cluster-api-provider-harvester

go 1.21

toolchain go1.21.11
go 1.22

require (
emperror.dev/errors v0.8.0
Expand Down

0 comments on commit 178c952

Please sign in to comment.