From 86046822267678711fe9f4bd8af6ea5a326ce330 Mon Sep 17 00:00:00 2001 From: Szilard Parrag Date: Thu, 25 Jan 2024 15:50:53 +0100 Subject: [PATCH] fix(ci): remove go toolchain, update controller-gen tool Signed-off-by: Szilard Parrag --- .github/workflows/e2e.yaml | 2 +- Makefile | 2 +- go.mod | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 30eb4df1..8ac41d99 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -8,7 +8,7 @@ on: pull_request: env: - GO_VERSION: '1.21' + GO_VERSION: '1.21.5' KUBECTL_VERSION: 'v1.24.1' jobs: diff --git a/Makefile b/Makefile index 7059684d..a75c7cad 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v5.2.1 -CONTROLLER_TOOLS_VERSION ?= v0.13.0 +CONTROLLER_TOOLS_VERSION ?= v0.14.0 .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading. diff --git a/go.mod b/go.mod index 14a2ea23..5a496c59 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/kube-logging/subscription-operator go 1.21 -toolchain go1.21.5 - require ( emperror.dev/errors v0.8.1 github.com/cisco-open/operator-tools v0.34.0