upgrade go version. (#9)

Signed-off-by: morvencao <[email protected]>

.github/workflows/go-postsubmit.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.19'
   GO_REQUIRED_MIN_VERSION: ''
 defaults:
   run:

.github/workflows/go-presubmit.yml

@@ -12,7 +12,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.19'
   GO_REQUIRED_MIN_VERSION: ''
 defaults:
   run:
@@ -34,14 +34,6 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - name: build
         run: make build
-  linelint:
-    name: linelint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Linelint
-        uses: fernandrone/[email protected]
   verify:
     name: verify
     runs-on: ubuntu-latest

.github/workflows/go-release.yml

@@ -6,7 +6,7 @@ on:
       - 'v*.*.*'
 env:
   # Common versions
-  GO_VERSION: '1.17'
+  GO_VERSION: '1.19'
   GO_REQUIRED_MIN_VERSION: ''
   GITHUB_REF: ${{ github.ref }}
   CHART_NAME: 'multicluster-mesh'

Dockerfile

@@ -1,5 +1,5 @@
 # Build the multicluster-mesh-addon binary
-FROM golang:1.17 as builder
+FROM golang:1.19 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -14,10 +14,6 @@ endif
 # Tools for deploy
 KUBECTL?=kubectl
 PWD=$(shell pwd)
-KUSTOMIZE?=$(PWD)/$(PERMANENT_TMP_GOPATH)/bin/kustomize
-KUSTOMIZE_VERSION?=v3.5.4
-KUSTOMIZE_ARCHIVE_NAME?=kustomize_$(KUSTOMIZE_VERSION)_$(GOHOSTOS)_$(GOHOSTARCH).tar.gz
-kustomize_dir:=$(dir $(KUSTOMIZE))
 
 IMAGE ?= quay.io/open-cluster-management/multicluster-mesh-addon:latest
 
@@ -44,14 +40,17 @@ help: ## Display this help.
 ##@ Development
 
 .PHONY: fmt
-fmt: linelint ## Run go fmt against code.
+fmt: ## Run go fmt against code.
 	go fmt ./...
-	$(LINELINT) -a .
 
 .PHONY: vet
 vet: ## Run go vet against code.
 	go vet ./...
 
+.PHONY: lint
+lint: golangci-lint ## Run golangci-lint against code.
+	$(GOLANGCI_LINT) run
+
 .PHONY: test
 test: fmt vet ## Run tests.
 	go test ./... -coverprofile cover.out
@@ -109,31 +108,40 @@ deploy: kustomize
 undeploy: kustomize
 	$(KUSTOMIZE) build deploy | $(KUBECTL) delete --ignore-not-found -f -
 
-CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
-.PHONY: controller-gen
-controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
+## Location to install dependencies to
+LOCALBIN ?= $(shell pwd)/bin
+$(LOCALBIN):
+	mkdir -p $(LOCALBIN)
+
+GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
+KUSTOMIZE ?= $(LOCALBIN)/kustomize
+CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
+
+## Tool Versions
+GOLANGCI_LINT_VERSION ?= v1.54.2
+KUSTOMIZE_VERSION ?= v5.2.1
+CONTROLLER_TOOLS_VERSION ?= v0.13.0
 
-LINELINT = $(shell pwd)/bin/linelint
-.PHONY: linelint
-linelint: ## Download linelint locally if necessary.
-	$(call go-get-tool,$(LINELINT),github.com/fernandrone/[email protected])
 
-KUSTOMIZE = $(shell pwd)/bin/kustomize
+.PHONY: golangci-lint
+golangci-lint:
+	@[ -f $(GOLANGCI_LINT) ] || { \
+	set -e ;\
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION) ;\
+	}
+
 .PHONY: kustomize
-kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
-
-# go-get-tool will 'go get' any package $2 and install it to $1.
-PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-define go-get-tool
-@[ -f $(1) ] || { \
-set -e ;\
-TMP_DIR=$$(mktemp -d) ;\
-cd $$TMP_DIR ;\
-go mod init tmp ;\
-echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
-rm -rf $$TMP_DIR ;\
-}
-endef
+kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
+$(KUSTOMIZE): $(LOCALBIN)
+	@if test -x $(LOCALBIN)/kustomize && ! $(LOCALBIN)/kustomize version | grep -q $(KUSTOMIZE_VERSION); then \
+		echo "$(LOCALBIN)/kustomize version is not expected $(KUSTOMIZE_VERSION). Removing it before installing."; \
+		rm -rf $(LOCALBIN)/kustomize; \
+	fi
+	test -s $(LOCALBIN)/kustomize || GOBIN=$(LOCALBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v5@$(KUSTOMIZE_VERSION)
+
+.PHONY: controller-gen
+controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. If wrong version is installed, it will be overwritten.
+$(CONTROLLER_GEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
+	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
+

README.md

@@ -92,7 +92,7 @@ cd demo && ./demo
 ### Prerequisites
 
 - Ensure [docker](https://docs.docker.com/get-started) 18.03+ is installed.
-- Ensure [golang](https://golang.org/doc/install) 1.17+ is installed.
+- Ensure [golang](https://golang.org/doc/install) 1.19+ is installed.
 - Prepare an environment of [OCM](https://open-cluster-management.io/getting-started/core/) and login to the hub cluster with `kubectl` command line tool.
 - Make sure at least one managed cluster imported to the OCM hub cluster.
 - For mesh federation support, make sure at least two managed clusters are imported and the cloud provider must support the network load balancer IP so that the meshes spanning across managed clusters can be connected.

apis/mesh/v1alpha1/groupversion_info.go

@@ -1,6 +1,6 @@
 // Package v1alpha1 contains API Schema definitions for the mesh v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=mesh.open-cluster-management.io
+// +kubebuilder:object:generate=true
+// +groupName=mesh.open-cluster-management.io
 package v1alpha1
 
 import (

go.mod

@@ -1,6 +1,6 @@
 module open-cluster-management.io/multicluster-mesh-addon
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gogo/protobuf v1.3.2