Merge pull request #35 from RadekManak/rebase

Rebase onto latest upstream version
openshift · Oct 16, 2023 · 500628a · 500628a
2 parents 8c532d2 + 57e2437
commit 500628a
Show file tree

Hide file tree

Showing 4,739 changed files with 587,994 additions and 71,781 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,5 @@
+
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.19-openshift-4.14
+  tag: rhel-8-release-golang-1.20-openshift-4.15
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.20 as builder
 ADD . /build
 WORKDIR /build/
 ARG TARGETOS

diff --git a/Makefile b/Makefile
@@ -35,6 +35,9 @@ GIT_COMMIT=$(shell git rev-parse HEAD)
 BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%S%z)
 ldflags="-s -w -X $(VERSION_PKG).Version=$(TAG) -X $(VERSION_PKG).GitCommit=${GIT_COMMIT} -X ${VERSION_PKG}.BuildDate=${BUILD_DATE}"
 
+#tools
+GOLANGCI_LINT = GOGC=30 go run -mod=vendor ${REPO_ROOT}/vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
+
 .PHONY: cloud-controller-manager
 cloud-controller-manager: gofmt unit-test
 	@echo + Building cloud-controller-manager binary
@@ -109,8 +112,7 @@ gofmt:
 
 .PHONY: golint
 golint:
-	which golangci-lint 2>&1 >/dev/null || go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.48.0
-	golangci-lint run pkg/... --timeout=300s
+	${GOLANGCI_LINT} run pkg/... --timeout=300s
 
 unit-test:
 	GO111MODULE=on go test -mod vendor -v -race -coverprofile=coverage.txt -covermode=atomic \