Controller runtime 0.8.3, CRD v1, Go 1.16 (kube-logging#744)

Go 1.16, Controller runtime v0.8.3, CRD v1, controller-gen v0.5.0 Co-authored-by: shifter <[email protected]> Co-authored-by: Dudás Ádám <[email protected]>
xinjixi · May 31, 2021 · 3477060 · 3477060
1 parent 4b93978
commit 3477060
Show file tree

Hide file tree

Showing 27 changed files with 35,196 additions and 34,699 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,7 @@ executors:
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.13
+      - image: circleci/golang:1.16
         environment:
           GOFLAGS: -mod=readonly
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.16
 
       - name: Checkout code
         uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.16 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -
 GOFILES_NOPLUGINS =  $(shell find . -type f -name '*.go' -not -path "./pkg/sdk/model/filter/*"  -not -path "./pkg/sdk/model/output/*"  -not -path "./pkg/sdk/model/input/*")
 PKGS=$(shell go list ./... | grep -v /vendor)
 
-CONTROLLER_GEN_VERSION = v0.2.4
+CONTROLLER_GEN_VERSION = v0.5.0
 CONTROLLER_GEN = $(PWD)/bin/controller-gen
 
 GOLANGCI_VERSION = 1.33.0
@@ -90,7 +90,6 @@ bin/kubebuilder: bin/kubebuilder_${KUBEBUILDER_VERSION}
 test: generate fmt vet manifests bin/kubebuilder
 	@which kubebuilder
 	@which etcd
-	kubebuilder version
 	cd pkg/sdk && go test ./...
 	go test ./controllers/... ./pkg/... -coverprofile cover.out -v
 
@@ -164,3 +163,6 @@ check-diff: check
 	go mod tidy
 	$(MAKE) generate manifests
 	git diff --exit-code ':(exclude)./ADOPTERS.md' ':(exclude)./docs/*'
+
+tidy:
+	find . -iname "go.mod" | xargs -L1 sh -c 'cd $$(dirname $$0); go mod tidy'