Upgrade wire and golang (kubemod#73)

* Upgrade wire and golang
stefan-caraiman · Sep 6, 2021 · 91408bb · 91408bb
1 parent a57f209
commit 91408bb
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 15 deletions.
diff --git a/.github/workflows/master-workflow.yaml b/.github/workflows/master-workflow.yaml
@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.7'
+          go-version: '1.17.0'
 
       - uses: actions/checkout@v2
 

diff --git a/.github/workflows/tag-workflow.yaml b/.github/workflows/tag-workflow.yaml
@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.7'
+          go-version: '1.17.0'
 
       - uses: actions/checkout@v2
 

diff --git a/.github/workflows/topic-workflow.yaml b/.github/workflows/topic-workflow.yaml
@@ -14,7 +14,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.14.7'
+          go-version: '1.17.0'
 
       - uses: actions/checkout@v2
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+- 72: Upgrade to wire 0.5.0 and golang 1.17
 - 67: Update upgrade instructions to explicitly delete certificate generation job
 
 ## 0.13.0 - 2021-05-15

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

diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ docker-push:
 # Develop in docker
 docker-develop:
 	docker run --rm -it -v $(PWD):/go/src/kubemod -w /go/src/kubemod \
-			--entrypoint bash golang:1.14.7
+			--entrypoint bash golang:1.17.0
 
 # find or download controller-gen
 # download controller-gen if necessary
@@ -96,7 +96,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
@@ -112,7 +112,7 @@ ifeq (, $(shell which wire))
 	WIRE_TMP_DIR=$$(mktemp -d) ;\
 	cd $$WIRE_TMP_DIR ;\
 	go mod init tmp ;\
-	go get github.com/google/wire/cmd/wire@v0.4.0 ;\
+	go install github.com/google/wire/cmd/wire@v0.5.0 ;\
 	rm -rf $$WIRE_TMP_DIR ;\
 	}
 WIRE=$(GOBIN)/wire

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/app/webapp.go b/app/webapp.go
@@ -88,7 +88,7 @@ func run(router *gin.Engine, webAppAddr string, log logr.Logger) {
 	}()
 
 	// Wait for interrupt signal to gracefully shutdown the server with a timeout of 10 seconds.
-	quit := make(chan os.Signal)
+	quit := make(chan os.Signal, 1)
 
 	// kill (no param) default send syscall.SIGTERM
 	// kill -2 is syscall.SIGINT

diff --git a/app/wire.go b/app/wire.go
@@ -1,4 +1,5 @@
-//+build wireinject
+//go:build wireinject
+// +build wireinject
 
 /*
 Licensed under the BSD 3-Clause License (the "License");

diff --git a/app/wire_gen.go b/app/wire_gen.go
diff --git a/core/wire.go b/core/wire.go
@@ -1,4 +1,5 @@
-//+build wireinject
+//go:build wireinject
+// +build wireinject
 
 /*
 Licensed under the BSD 3-Clause License (the "License");

diff --git a/core/wire_gen.go b/core/wire_gen.go
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/evanphx/json-patch/v5 v5.1.0
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-logr/logr v0.1.0
-	github.com/google/wire v0.4.0
+	github.com/google/wire v0.5.0
 	github.com/hexops/gotextdiff v1.0.3
 	github.com/onsi/ginkgo v1.14.1
 	github.com/onsi/gomega v1.10.2

diff --git a/go.sum b/go.sum
@@ -200,6 +200,8 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/wire v0.4.0 h1:kXcsA/rIGzJImVqPdhfnr6q0xsS9gU0515q1EPpJ9fE=
 github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
+github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8=
+github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=