Skip to content

Commit 3b5a778

Browse files
committed
Update to the new libraries
- csi-lib-utils requires context in few calls - new feature gate franework checks that feature gates are not set in parallel tests.
1 parent 79246c9 commit 3b5a778

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

cmd/csi-provisioner/csi-provisioner.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import (
5252
_ "k8s.io/component-base/metrics/prometheus/clientgo/leaderelection" // register leader election in the default legacy registry
5353
_ "k8s.io/component-base/metrics/prometheus/workqueue" // register work queues in the default legacy registry
5454
csitrans "k8s.io/csi-translation-lib"
55-
"k8s.io/klog/v2"
55+
klog "k8s.io/klog/v2"
5656
"sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller"
5757
libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller/metrics"
5858

@@ -210,13 +210,13 @@ func main() {
210210
metrics.WithSubsystem(metrics.SubsystemSidecar),
211211
)
212212

213-
grpcClient, err := ctrl.Connect(*csiEndpoint, metricsManager)
213+
grpcClient, err := ctrl.Connect(ctx, *csiEndpoint, metricsManager)
214214
if err != nil {
215215
klog.Error(err.Error())
216216
os.Exit(1)
217217
}
218218

219-
err = ctrl.Probe(grpcClient, *operationTimeout)
219+
err = ctrl.Probe(ctx, grpcClient, *operationTimeout)
220220
if err != nil {
221221
klog.Error(err.Error())
222222
os.Exit(1)
@@ -244,15 +244,15 @@ func main() {
244244
// Will be provided via default gatherer.
245245
metrics.WithProcessStartTime(false),
246246
metrics.WithMigration())
247-
migratedGrpcClient, err := ctrl.Connect(*csiEndpoint, metricsManager)
247+
migratedGrpcClient, err := ctrl.Connect(ctx, *csiEndpoint, metricsManager)
248248
if err != nil {
249249
klog.Error(err.Error())
250250
os.Exit(1)
251251
}
252252
grpcClient.Close()
253253
grpcClient = migratedGrpcClient
254254

255-
err = ctrl.Probe(grpcClient, *operationTimeout)
255+
err = ctrl.Probe(ctx, grpcClient, *operationTimeout)
256256
if err != nil {
257257
klog.Error(err.Error())
258258
os.Exit(1)

pkg/controller/controller.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import (
5050
"k8s.io/client-go/tools/cache"
5151
"k8s.io/client-go/tools/record"
5252
"k8s.io/client-go/util/workqueue"
53-
"k8s.io/klog/v2"
53+
klog "k8s.io/klog/v2"
5454
"sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller"
5555
"sigs.k8s.io/sig-storage-lib-external-provisioner/v9/util"
5656

@@ -288,12 +288,12 @@ var (
288288
// identify string will be added in PV annotations under this key.
289289
var provisionerIDKey = "storage.kubernetes.io/csiProvisionerIdentity"
290290

291-
func Connect(address string, metricsManager metrics.CSIMetricsManager) (*grpc.ClientConn, error) {
292-
return connection.Connect(address, metricsManager, connection.OnConnectionLoss(connection.ExitOnConnectionLoss()))
291+
func Connect(ctx context.Context, address string, metricsManager metrics.CSIMetricsManager) (*grpc.ClientConn, error) {
292+
return connection.Connect(ctx, address, metricsManager, connection.OnConnectionLoss(connection.ExitOnConnectionLoss()))
293293
}
294294

295-
func Probe(conn *grpc.ClientConn, singleCallTimeout time.Duration) error {
296-
return rpc.ProbeForever(conn, singleCallTimeout)
295+
func Probe(ctx context.Context, conn *grpc.ClientConn, singleCallTimeout time.Duration) error {
296+
return rpc.ProbeForever(ctx, conn, singleCallTimeout)
297297
}
298298

299299
func GetDriverName(conn *grpc.ClientConn, timeout time.Duration) (string, error) {

pkg/controller/controller_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
"k8s.io/component-base/featuregate"
4747
utilfeaturetesting "k8s.io/component-base/featuregate/testing"
4848
csitrans "k8s.io/csi-translation-lib"
49-
"k8s.io/klog/v2"
49+
klog "k8s.io/klog/v2"
5050
"sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller"
5151

5252
"github.com/kubernetes-csi/csi-lib-utils/connection"
@@ -89,7 +89,8 @@ type csiConnection struct {
8989

9090
func New(address string) (csiConnection, error) {
9191
metricsManager := metrics.NewCSIMetricsManager("fake.csi.driver.io" /* driverName */)
92-
conn, err := connection.Connect(address, metricsManager)
92+
ctx := context.Background()
93+
conn, err := connection.Connect(ctx, address, metricsManager)
9394
if err != nil {
9495
return csiConnection{}, err
9596
}
@@ -6479,10 +6480,6 @@ func TestProvisionFromPVC(t *testing.T) {
64796480
for k, tc := range testcases {
64806481
tc := tc
64816482
t.Run(k, func(t *testing.T) {
6482-
// TODO: https://github.com/kubernetes-csi/external-provisioner/issues/833
6483-
if !tc.xnsEnabled {
6484-
t.Parallel()
6485-
}
64866483
var clientSet *fakeclientset.Clientset
64876484

64886485
// Phase: setup mock server

0 commit comments

Comments
 (0)