Merge pull request #479 from AndrewSirenko/cherry-picks

Release v1.13.2

Author: k8s-ci-robot

CHANGELOG/CHANGELOG-1.13.md

@@ -1,3 +1,28 @@
+# Release notes for 1.13.2
+
+[Documentation](https://kubernetes-csi.github.io)
+
+## Changes by Kind
+
+### Feature
+
+- Serve additional leader election, work queue, process, and Go runtime metrics ([#475](https://github.com/kubernetes-csi/external-resizer/pull/475), [@AndrewSirenko](https://github.com/AndrewSirenko))
+
+### Bug fix
+
+- Fix panic when attempting to modify non-CSI volumes ([#471](https://github.com/kubernetes-csi/external-resizer/pull/471), [@AndrewSirenko](https://github.com/AndrewSirenko))
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+- github.com/kubernetes-csi/csi-lib-utils: [v0.20.0 → v0.21.0](https://github.com/kubernetes-csi/csi-lib-utils/compare/v0.20.0...v0.21.0)
+
+### Removed
+_Nothing has changed._
+
 # Release notes for 1.13.0
 
 [Documentation](https://kubernetes-csi.github.io)

cmd/csi-resizer/main.go

@@ -53,6 +53,9 @@ import (
 	"k8s.io/component-base/logs"
 	logsapi "k8s.io/component-base/logs/api/v1"
 	_ "k8s.io/component-base/logs/json/register"
+	"k8s.io/component-base/metrics/legacyregistry"
+	_ "k8s.io/component-base/metrics/prometheus/clientgo/leaderelection" // register leader election in the default legacy registry
+	_ "k8s.io/component-base/metrics/prometheus/workqueue"               // register work queues in the default legacy registry
 )
 
 var (
@@ -177,6 +180,10 @@ func main() {
 		csiClient = migratedCsiClient
 	}
 
+	// Add default legacy registry so that metrics manager serves Go runtime and process metrics.
+	// Also registers the `k8s.io/component-base/` work queue and leader election metrics we anonymously import.
+	metricsManager.WithAdditionalRegistry(legacyregistry.DefaultGatherer)
+
 	csiResizer, err := resizer.NewResizerFromClient(
 		csiClient,
 		*timeout,

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/container-storage-interface/spec v1.11.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/kubernetes-csi/csi-lib-utils v0.20.0
+	github.com/kubernetes-csi/csi-lib-utils v0.21.0
 	golang.org/x/oauth2 v0.25.0 // indirect
 	golang.org/x/term v0.28.0 // indirect
 	google.golang.org/grpc v1.69.2

go.sum

@@ -60,8 +60,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubernetes-csi/csi-lib-utils v0.20.0 h1:JTvHRJugn+cByMnIU4nCnqPqOOUhuPzhlLqRvenwjDA=
-github.com/kubernetes-csi/csi-lib-utils v0.20.0/go.mod h1:3b/HFVURW11oxV/gUAKyhhkvFpxXO/zRdvh1wdEfCZY=
+github.com/kubernetes-csi/csi-lib-utils v0.21.0 h1:dUN/iIgXLucAxyML2iPyhniIlACQumIeAJmIzsMBddc=
+github.com/kubernetes-csi/csi-lib-utils v0.21.0/go.mod h1:ZCVRTYuup+bwX9tOeE5Q3LDw64QvltSwMUQ3M3g2T+Q=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=

pkg/modifycontroller/controller.go

@@ -268,11 +268,16 @@ func (ctrl *modifyController) syncPVC(key string) error {
 	}
 
 	// Only trigger modify volume if the following conditions are met
-	// 1. Non-empty vac name
-	// 2. PVC is in Bound state
-	// 3. PV CSI driver name matches local driver
+	// 1. PV provisioned by CSI driver AND driver name matches local driver
+	// 2. Non-empty vac name
+	// 3. PVC is in Bound state
+	if pv.Spec.CSI == nil || pv.Spec.CSI.Driver != ctrl.name {
+		klog.V(7).InfoS("Skipping PV provisioned by different driver", "PV", klog.KObj(pv))
+		return nil
+	}
+
 	vacName := pvc.Spec.VolumeAttributesClassName
-	if vacName != nil && *vacName != "" && pvc.Status.Phase == v1.ClaimBound && pv.Spec.CSI.Driver == ctrl.name {
+	if vacName != nil && *vacName != "" && pvc.Status.Phase == v1.ClaimBound {
 		_, _, err, _ := ctrl.modify(pvc, pv)
 		if err != nil {
 			return err

pkg/modifycontroller/controller_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 	"testing"
 	"time"
@@ -156,6 +157,25 @@ func TestSyncPVC(t *testing.T) {
 	pvcWithUncreatedPV := createTestPVC(pvcName, targetVac /*vacName*/, testVac /*curVacName*/, testVac /*targetVacName*/)
 	pvcWithUncreatedPV.Spec.VolumeName = ""
 
+	nonCSIPVC := &v1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{Name: pvcName, Namespace: pvcNamespace},
+		Spec: v1.PersistentVolumeClaimSpec{
+			VolumeAttributesClassName: &targetVac,
+			VolumeName:                pvName,
+		},
+		Status: v1.PersistentVolumeClaimStatus{
+			Phase: v1.ClaimBound,
+		},
+	}
+	nonCSIPV := &v1.PersistentVolume{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: pvName,
+		},
+		Spec: v1.PersistentVolumeSpec{
+			VolumeAttributesClassName: nil,
+		},
+	}
+
 	tests := []struct {
 		name          string
 		pvc           *v1.PersistentVolumeClaim
@@ -192,6 +212,12 @@ func TestSyncPVC(t *testing.T) {
 			pv:            basePV,
 			callCSIModify: false,
 		},
+		{
+			name:          "Should NOT modify if PV wasn't provisioned by CSI driver",
+			pvc:           nonCSIPVC,
+			pv:            nonCSIPV,
+			callCSIModify: false,
+		},
 	}
 
 	for _, test := range tests {