Merge pull request #10 from rkojedzinszky/master

Update dependencies to work with k8s 1.20+

Author: travisghansen

Dockerfile

@@ -5,5 +5,6 @@ RUN apk update && \
     rm -rf /var/cache/apk/* && \
     update-ca-certificates
 
-COPY bin_release/freenas-iscsi-provisioner_linux-amd64 /freenas-iscsi-provisioner
+COPY bin/freenas-iscsi-provisioner /freenas-iscsi-provisioner
+
 ENTRYPOINT ["/freenas-iscsi-provisioner"]

Makefile

@@ -8,16 +8,13 @@ fmt:
 tmp:
 	mkdir -p tmp/
 
-vendor:
-	glide install -v --strip-vcs
-
-$(BIN)/freenas-provisioner build: vendor $(BIN) $(shell find . -name "*.go")
+$(BIN)/freenas-provisioner build: $(BIN) $(shell find . -name "*.go")
 	env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -o $(BIN)/freenas-iscsi-provisioner .
 
-darwin: vendor $(BIN) $(shell find . -name "*.go")
+darwin: $(BIN) $(shell find . -name "*.go")
 	env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -o $(BIN)/freenas-iscsi-provisioner-darwin .
 
-freebsd: vendor $(BIN) $(shell find . -name "*.go")
+freebsd: $(BIN) $(shell find . -name "*.go")
 	env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -o $(BIN)/freenas-iscsi-provisioner-freebsd .
 
 clean:

cli/command.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
@@ -9,12 +10,11 @@ import (
 
 	"github.com/golang/glog"
 	cli "github.com/jawher/mow.cli"
-	"github.com/kubernetes-incubator/external-storage/lib/controller"
 	freenasProvisioner "github.com/travisghansen/freenas-iscsi-provisioner/provisioner"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller"
 )
 
 const (
@@ -23,7 +23,6 @@ const (
 	leasePeriod               = controller.DefaultLeaseDuration
 	retryPeriod               = controller.DefaultRetryPeriod
 	renewDeadline             = controller.DefaultRenewDeadline
-	termLimit                 = controller.DefaultTermLimit
 )
 
 var (
@@ -180,9 +179,8 @@ func execute() {
 		controller.LeaseDuration(time.Duration(*controllerLeaseDuration)*time.Second),
 		controller.RenewDeadline(time.Duration(*controllerRenewDeadline)*time.Second),
 		controller.RetryPeriod(time.Duration(*controllerRetryPeriod)*time.Second),
-		controller.TermLimit(time.Duration(*controllerLeaseDuration)*time.Second),
 		controller.MetricsPort(int32(*controllerMetricsPort)),
 	)
 
-	pc.Run(wait.NeverStop)
+	pc.Run(context.Background())
 }

glide.lock

@@ -0,0 +1,13 @@
+module github.com/travisghansen/freenas-iscsi-provisioner
+
+go 1.15
+
+require (
+	github.com/dghubble/sling v1.3.0
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+	github.com/jawher/mow.cli v1.2.0
+	k8s.io/api v0.20.2
+	k8s.io/apimachinery v0.20.2
+	k8s.io/client-go v0.20.2
+	sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.2.0
+)