Bug 2052757: [4.9] PVs are not being cleaned up after PVC deletion

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: golang-1.11
+  tag: rhel-8-release-golang-1.16-openshift-4.9

CHANGELOG.md

@@ -1,5 +1,7 @@
 # HEAD
 
+# [v2.4.0](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner/releases/tag/v2.4.0)
+
 Image updates:
 
 - add `namePattern` field to filter volumes

Makefile

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-REGISTRY ?= quay.io/external_storage
+REGISTRY ?= k8s.gcr.io/sig-storage
 VERSION ?= latest
-GOVERSION ?= 1.13.9
+GOVERSION ?= 1.16.1
 ARCH ?= amd64
 
 ALL_ARCH = amd64 arm arm64 ppc64le s390x

README.md

@@ -121,7 +121,7 @@ Also see [known issues](KNOWN_ISSUES.md) and [CHANGELOG](CHANGELOG.md).
 
 * New PV.NodeAffinity field added.
 * **Important:** Alpha PV NodeAffinity annotation is deprecated. Users must manually update
-  their PVs to use the new NodeAffinity field or run a [one-time update job](utils/update-pv-to-beta).
+  their PVs to use the new NodeAffinity field or run a [one-time update job](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner/tree/master/cmd/utils/update-pv-to-beta).
 * Alpha: Raw block support added.
 
 ### 1.9: Alpha

cmd/local-volume-provisioner/main.go

@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"flag"
 	"log"
 	"math/rand"
@@ -26,7 +27,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
 	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/controller"
 	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/deleter"
@@ -119,7 +120,7 @@ func getNode(client *kubernetes.Clientset, name string) *v1.Node {
 	var retries int
 
 	for {
-		node, err := client.CoreV1().Nodes().Get(name, metav1.GetOptions{})
+		node, err := client.CoreV1().Nodes().Get(context.TODO(), name, metav1.GetOptions{})
 		if err == nil {
 			return node
 		}

cmd/utils/update-pv-to-beta/Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ifeq ($(REGISTRY),)
-	REGISTRY = quay.io/external_storage/
+	REGISTRY = k8s.gcr.io/sig-storage/
 endif
 
 ifeq ($(VERSION),)

cmd/utils/update-pv-to-beta/README.md

@@ -98,7 +98,7 @@ Pod Template:
   Service Account:  local-storage-update
   Containers:
    updater:
-    Image:        quay.io/external_storage/local-volume-update-pv-to-beta:latest
+    Image:        k8s.gcr.io/sig-storage/local-volume-update-pv-to-beta:latest
     Port:         <none>
     Host Port:    <none>
     Environment:  <none>

cmd/utils/update-pv-to-beta/deployment/kubernetes/update-pv-to-beta.yaml

@@ -12,7 +12,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: updater
-        image: quay.io/external_storage/local-volume-update-pv-to-beta:latest
+        image: k8s.gcr.io/sig-storage/local-volume-update-pv-to-beta:latest
         env:
         # If you want provisioner to use a kubeconfig file to access API server, instead of the default
               #  in-cluster config, then specify the following environment variable:

cmd/utils/update-pv-to-beta/update_pv_na_to_beta.go

@@ -17,14 +17,15 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
 
 	"github.com/golang/glog"
 	"sigs.k8s.io/sig-storage-local-static-provisioner/pkg/common"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
@@ -56,7 +57,7 @@ func updateLocalPVAlphaAnn(client *kubernetes.Clientset, pv *v1.PersistentVolume
 		}
 
 		glog.Infof("Updating local PV(%s), node affinity is: %v", pv.Name, pv.Annotations[common.AlphaStorageNodeAffinityAnnotation])
-		_, err = client.CoreV1().PersistentVolumes().Update(pvClone)
+		_, err = client.CoreV1().PersistentVolumes().Update(context.TODO(), pvClone, metav1.UpdateOptions{})
 		if err != nil {
 			if errors.IsNotFound(err) {
 				glog.Errorf("PV(%s) seems to have been deleted", pv.Name)
@@ -69,7 +70,7 @@ func updateLocalPVAlphaAnn(client *kubernetes.Clientset, pv *v1.PersistentVolume
 }
 
 func startSwitchingLocalPVAlphaAnn(client *kubernetes.Clientset) error {
-	pvs, err := client.CoreV1().PersistentVolumes().List(metav1.ListOptions{})
+	pvs, err := client.CoreV1().PersistentVolumes().List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		glog.Errorf("list PVs error: %v", err)
 	}

deployment/docker/Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG ARCH=amd64
-ARG GOVERSION=1.13.9
+ARG GOVERSION=1.16.1
 FROM golang:$GOVERSION-alpine as builder
 ARG OS=linux
 ARG ARCH=amd64
@@ -23,8 +23,8 @@ RUN echo "OS: $OS ARCH: $ARCH"
 RUN GO111MODULE=off CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -a -ldflags '-extldflags "-static"' -o _output/${OS}/${ARCH}/local-volume-provisioner ./cmd/local-volume-provisioner
 
 # For security, we use kubernetes community maintained debian base image.
-# https://github.com/kubernetes/kubernetes/blob/master/build/debian-base/
-FROM k8s.gcr.io/debian-base-${ARCH}:v1.0.0
+# https://github.com/kubernetes/release/tree/master/images/build/debian-base
+FROM k8s.gcr.io/build-image/debian-base-${ARCH}:buster-v1.4.0
 ARG OS=linux
 ARG ARCH=amd64
 

deployment/kubernetes/example/default_example_provisioner_generated.yaml

@@ -36,7 +36,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "k8s.gcr.io/sig-storage/local-volume-provisioner:v2.4.0"
           imagePullPolicy: "Always"
           name: provisioner 
           securityContext:

docs/getting-started.md

@@ -14,7 +14,8 @@ on older versions, please see version links under
   * [Option 3: Baremetal environments](#option-3-baremetal-environments)
   * [Option 4: Local test cluster](#option-4-local-test-cluster)
   * [Option 5: EKS (experimental)](#option-5-eks-experimental)
-  * [Option 6: AKS](#option-6-aks)  
+  * [Option 6: AKS](#option-6-aks)
+  * [Option 7: LKE](#option-7-lke)
 - [Step 2: Creating a StorageClass (1.9+)](#step-2-creating-a-storageclass-19)
 - [Step 3: Creating local persistent volumes](#step-3-creating-local-persistent-volumes)
   * [Option 1: Using the local volume static provisioner](#option-1-using-the-local-volume-static-provisioner)
@@ -111,7 +112,7 @@ for more information.
 
 [eks-nvme-ssd-provisioner](https://github.com/brunsgaard/eks-nvme-ssd-provisioner)
 runs as a DaemonSet and will automatically format and mount the requested local
-NVMe SSDs. 
+NVMe SSDs.
 
 **Note:** This project mounts disks in `/pv-disks/$uuid`. There is a
 working example of storage local static provisioner resources in the
@@ -120,6 +121,10 @@ eks-nvme-ssd-provisioner repo.
 #### Option 6: AKS
 See [Local Persistent Volume support on Azure](https://github.com/Azure/kubernetes-volume-drivers/tree/master/local) for more information.
 
+### Option 7: LKE
+
+LKE clusters can be created with custom Node Pools using the [Linode API](https://www.linode.com/docs/products/tools/linode-api/). For more information, see the [LKE Endpoints Collection](https://www.linode.com/docs/api/linode-kubernetes-engine-lke).
+
 ### Step 2: Creating a StorageClass (1.9+)
 
 To delay volume binding until pod scheduling and to handle multiple local PVs in

go.mod

@@ -5,70 +5,48 @@ go 1.13
 require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.8.1
-	github.com/prometheus/client_golang v1.0.0
-	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
-	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
-	golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5
-	golang.org/x/text v0.3.3 // indirect
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
-	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.17.0
-	k8s.io/apimachinery v0.17.0
-	k8s.io/apiserver v0.17.0
-	k8s.io/client-go v0.17.0
-	k8s.io/component-base v0.17.0
-	k8s.io/klog v1.0.0
-	k8s.io/kubernetes v1.17.0
-	k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
-	sigs.k8s.io/sig-storage-lib-external-provisioner v4.1.0+incompatible
+	github.com/onsi/ginkgo v1.12.0
+	github.com/onsi/gomega v1.9.0
+	github.com/prometheus/client_golang v1.7.1
+	golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/api v0.21.0
+	k8s.io/apimachinery v0.21.0
+	k8s.io/apiserver v0.21.0
+	k8s.io/client-go v0.21.0
+	k8s.io/component-base v0.21.0
+	k8s.io/klog/v2 v2.8.0
+	k8s.io/kubernetes v1.21.0
+	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
+	sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
 )
 
-replace k8s.io/api => k8s.io/api v0.17.0
-
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.0
-
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.17.0
-
-replace k8s.io/apiserver => k8s.io/apiserver v0.17.0
-
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.0
-
-replace k8s.io/client-go => k8s.io/client-go v0.17.0
-
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.0
-
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.0
-
-replace k8s.io/code-generator => k8s.io/code-generator v0.17.0
-
-replace k8s.io/component-base => k8s.io/component-base v0.17.0
-
-replace k8s.io/cri-api => k8s.io/cri-api v0.17.0
-
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.0
-
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.0
-
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.0
-
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.0
-
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.0
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.17.0
-
-replace k8s.io/kubelet => k8s.io/kubelet v0.17.0
-
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.0
-
-replace k8s.io/metrics => k8s.io/metrics v0.17.0
-
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.0
-
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.17.0
-
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.17.0
-
-replace k8s.io/node-api => k8s.io/node-api v0.17.0
+replace (
+	k8s.io/api => k8s.io/api v0.21.0
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
+	k8s.io/apiserver => k8s.io/apiserver v0.21.0
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
+	k8s.io/client-go => k8s.io/client-go v0.21.0
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
+	k8s.io/code-generator => k8s.io/code-generator v0.21.0
+	k8s.io/component-base => k8s.io/component-base v0.21.0
+	k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
+	k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
+	k8s.io/cri-api => k8s.io/cri-api v0.21.0
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
+	k8s.io/kubectl => k8s.io/kubectl v0.21.0
+	k8s.io/kubelet => k8s.io/kubelet v0.21.0
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
+	k8s.io/metrics => k8s.io/metrics v0.21.0
+	k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
+	k8s.io/node-api => k8s.io/node-api v0.21.0
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
+	k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
+)