feat(deps): bump k8s, go, lib-csi (#232)

Signed-off-by: Niladri Halder <[email protected]>

Author: niladrih

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
           reporter: github-pr-review
           path: '.'
           pattern: '*.sh'
-          exclude: './.git/*,./vendor/*'
+          exclude: './.git/*'
 
       - name: install golangci-lint
         run: make install-golangci-lint
@@ -72,20 +72,21 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        kubernetes: [v1.20.1]
+        kubernetes: [v1.25.10]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.19
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.16.5
+          go-version: 1.19.9
+          cache: false
 
       - name: Setup Minikube-Kubernetes
-        uses: manusa/actions-setup-minikube@v2.3.0
+        uses: manusa/actions-setup-minikube@v2.7.2
         with:
-          minikube version: v1.16.0
+          minikube version: v1.26.1
           kubernetes version: ${{ matrix.kubernetes }}
           github token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/pull_request.yml

@@ -36,10 +36,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.19
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.16.5
+          go-version: 1.19.9
+          cache: false
 
       - name: Format test
         run: make format
@@ -60,7 +61,6 @@ jobs:
           reporter: github-pr-review
           path: '.'
           pattern: '*.sh'
-          exclude: './vendor/*'
 
 
   unit-test:
@@ -81,20 +81,21 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        kubernetes: [v1.20.1]
+        kubernetes: [v1.25.10]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.16
-        uses: actions/setup-go@v2
+      - name: Set up Go 1.19
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.16.5
+          go-version: 1.19.9
+          cache: false
 
       - name: Setup Minikube-Kubernetes
-        uses: manusa/actions-setup-minikube@v2.3.0
+        uses: manusa/actions-setup-minikube@v2.7.2
         with:
-          minikube version: v1.16.0
+          minikube version: v1.26.1
           kubernetes version: ${{ matrix.kubernetes }}
           github token: ${{ secrets.GITHUB_TOKEN }}
 

Makefile

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 # list only csi source code directories
-PACKAGES = $(shell go list ./... | grep -v 'vendor\|pkg/generated')
+PACKAGES = $(shell go list ./... | grep -v 'pkg/generated')
 
-UNIT_TEST_PACKAGES = $(shell go list ./... | grep -v 'vendor\|pkg/generated\|tests')
+UNIT_TEST_PACKAGES = $(shell go list ./... | grep -v 'pkg/generated\|tests')
 
 # Lint our code. Reference: https://golang.org/cmd/vet/
 VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
@@ -126,17 +126,13 @@ verify-deps: deps
 		echo "go module files are out of date, please commit the changes to go.mod and go.sum"; exit 1; \
 	fi
 
-.PHONY: vendor
-vendor: go.mod go.sum deps
-	@go mod vendor
-
 # Bootstrap downloads tools required
 # during build
 .PHONY: bootstrap
 bootstrap: controller-gen install-golangci-lint
 	@for tool in  $(EXTERNAL_TOOLS) ; do \
 		echo "+ Installing $$tool" ; \
-		cd && GO111MODULE=on go get $$tool; \
+		cd && GO111MODULE=on go install $$tool@latest; \
 	done
 
 ## golangci-lint tool used to check linting tools in codebase
@@ -147,11 +143,11 @@ bootstrap: controller-gen install-golangci-lint
 ## Install golangci-lint only if tool doesn't exist in system
 .PHONY: install-golangci-lint
 install-golangci-lint:
-	$(if $(shell which golangci-lint), echo "golangci-lint already exist in system", (curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b "${GOPATH}/bin" v1.40.1))
+	$(if $(shell which golangci-lint), echo "golangci-lint already exist in system", (curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b "${GOPATH}/bin" v1.52.2))
 
 .PHONY: controller-gen
 controller-gen:
-	TMP_DIR=$(shell mktemp -d) && cd $$TMP_DIR && go mod init tmp && go get sigs.k8s.io/controller-tools/cmd/[email protected] && rm -rf $$TMP_DIR;
+	TMP_DIR=$(shell mktemp -d) && cd $$TMP_DIR && go mod init tmp && go install sigs.k8s.io/controller-tools/cmd/[email protected] && rm -rf $$TMP_DIR;
 
 # SRC_PKG is the path of code files
 SRC_PKG := github.com/openebs/lvm-localpv/pkg
@@ -170,7 +166,7 @@ kubegendelete:
 
 .PHONY: deepcopy-install
 deepcopy-install:
-	@go install ./vendor/k8s.io/code-generator/cmd/deepcopy-gen
+	@go install k8s.io/code-generator/cmd/deepcopy-gen
 
 .PHONY: deepcopy
 deepcopy:
@@ -182,7 +178,7 @@ deepcopy:
 
 .PHONY: clientset-install
 clientset-install:
-	@go install ./vendor/k8s.io/code-generator/cmd/client-gen
+	@go install k8s.io/code-generator/cmd/client-gen
 
 .PHONY: clientset
 clientset:
@@ -196,7 +192,7 @@ clientset:
 
 .PHONY: lister-install
 lister-install:
-	@go install ./vendor/k8s.io/code-generator/cmd/lister-gen
+	@go install k8s.io/code-generator/cmd/lister-gen
 
 .PHONY: lister
 lister:
@@ -208,7 +204,7 @@ lister:
 
 .PHONY: informer-install
 informer-install:
-	@go install ./vendor/k8s.io/code-generator/cmd/informer-gen
+	@go install k8s.io/code-generator/cmd/informer-gen
 
 .PHONY: informer
 informer:
@@ -285,7 +281,7 @@ golint:
 .PHONY: license-check
 license-check:
 	@echo "--> Checking license header..."
-	@licRes=$$(for file in $$(find . -type f -regex '.*\.sh\|.*\.go\|.*Docker.*\|.*\Makefile*' ! -path './vendor/*' ) ; do \
+	@licRes=$$(for file in $$(find . -type f -regex '.*\.sh\|.*\.go\|.*Docker.*\|.*\Makefile*') ; do \
                awk 'NR<=5' $$file | grep -Eq "(Copyright|generated|GENERATED)" || echo $$file; \
        done); \
        if [ -n "$${licRes}" ]; then \

buildscripts/lvm-driver/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.12
+FROM alpine:3.14.8
 RUN apk add --no-cache lvm2 lvm2-extra util-linux device-mapper
 RUN apk add --no-cache btrfs-progs xfsprogs xfsprogs-extra e2fsprogs e2fsprogs-extra
 RUN apk add --no-cache ca-certificates libc6-compat

buildscripts/lvm-driver/Dockerfile.buildx

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.14.7 as build
+FROM golang:1.19.9 as build
 
 ARG BRANCH
 ARG RELEASE_TAG
@@ -41,7 +41,7 @@ COPY . .
 
 RUN make buildx.csi-driver
 
-FROM alpine:3.12
+FROM alpine:3.14.8
 RUN apk add --no-cache lvm2 lvm2-extra util-linux device-mapper
 RUN apk add --no-cache btrfs-progs xfsprogs xfsprogs-extra e2fsprogs e2fsprogs-extra
 RUN apk add --no-cache ca-certificates libc6-compat

cmd/main.go

@@ -22,12 +22,13 @@ import (
 	"log"
 	"os"
 
+	"github.com/spf13/cobra"
+	"k8s.io/klog/v2"
+
 	"github.com/openebs/lvm-localpv/pkg/driver"
-	config "github.com/openebs/lvm-localpv/pkg/driver/config"
+	"github.com/openebs/lvm-localpv/pkg/driver/config"
 	"github.com/openebs/lvm-localpv/pkg/lvm"
 	"github.com/openebs/lvm-localpv/pkg/version"
-	"github.com/spf13/cobra"
-	"k8s.io/klog"
 )
 
 /*

go.mod

@@ -1,80 +1,88 @@
 module github.com/openebs/lvm-localpv
 
-go 1.14
-
-replace google.golang.org/protobuf => google.golang.org/protobuf v1.25.0
-
-replace k8s.io/api => k8s.io/api v0.20.2
-
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
-
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.20.2
-
-replace k8s.io/apiserver => k8s.io/apiserver v0.20.2
-
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
-
-replace k8s.io/client-go => k8s.io/client-go v0.20.2
-
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.2
-
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.2
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.20.2
-
-replace k8s.io/component-base => k8s.io/component-base v0.20.2
-
-replace k8s.io/cri-api => k8s.io/cri-api v0.20.2
-
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.2
-
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.2
-
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.2
-
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.2
-
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.2
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.20.2
-
-replace k8s.io/kubelet => k8s.io/kubelet v0.20.2
-
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.2
-
-replace k8s.io/metrics => k8s.io/metrics v0.20.2
-
-replace k8s.io/node-api => k8s.io/node-api v0.20.2
-
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.2
-
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.2
-
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.20.2
+go 1.19
 
 require (
-	github.com/container-storage-interface/spec v1.2.0
-	github.com/docker/go-units v0.3.3
-	github.com/ghodss/yaml v1.0.0
-	github.com/golang/protobuf v1.4.3
+	github.com/container-storage-interface/spec v1.8.0
+	github.com/docker/go-units v0.4.0
 	github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
 	github.com/kubernetes-csi/csi-lib-utils v0.9.0
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.7.0
-	github.com/openebs/lib-csi v0.6.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.27.4
+	github.com/openebs/lib-csi v0.7.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.11.0
-	github.com/spf13/cobra v1.1.1
-	github.com/stretchr/testify v1.6.1
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
-	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
-	google.golang.org/grpc v1.34.2
-	k8s.io/api v0.20.2
-	k8s.io/apimachinery v0.20.2
+	github.com/prometheus/client_golang v1.15.1
+	github.com/spf13/cobra v1.6.0
+	github.com/stretchr/testify v1.8.1
+	golang.org/x/net v0.10.0
+	golang.org/x/sys v0.8.0
+	google.golang.org/grpc v1.55.0
+	google.golang.org/protobuf v1.30.0
+	k8s.io/api v0.27.2
+	k8s.io/apimachinery v0.27.2
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	k8s.io/code-generator v0.20.2
-	k8s.io/klog v1.0.0
-	//k8s.io/kubernetes v0.20.2
-	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
+	k8s.io/code-generator v0.27.2
+	k8s.io/klog/v2 v2.100.1
+	k8s.io/utils v0.0.0-20230505201702-9f6742963106
 	sigs.k8s.io/controller-runtime v0.2.0
+	sigs.k8s.io/yaml v1.3.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/gnostic v0.6.9 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.10.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
+	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apiextensions-apiserver v0.27.2 // indirect
+	k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4 // indirect
+	k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/testing_frameworks v0.1.2 // indirect
+)
+
+replace (
+	github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.2.0
+	k8s.io/client-go => k8s.io/client-go v0.27.2
 )