Skip to content

Commit 9688530

Browse files
anchaubeanchaube
committed
Version conflict sig-storage-lib-external-provisioner update to v8
1 parent 34dc221 commit 9688530

File tree

21 files changed

+15
-2933
lines changed

21 files changed

+15
-2933
lines changed

‎cmd/oci-csi-controller-driver/csi-provisioner/csi-provisioner.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ func StartCSIProvisioner(csioptions csioptions.CSIOptions) {
235235
controller.CreateProvisionedPVLimiter(workqueue.DefaultControllerRateLimiter()),
236236
controller.ClaimsInformer(claimInformer),
237237
}
238-
//Todo :- translator IsMigratedCSIDriverByName
238+
239239
translator := csitranslationlib.New()
240240

241241
supportsMigrationFromInTreePluginName := ""
@@ -298,7 +298,7 @@ func StartCSIProvisioner(csioptions csioptions.CSIOptions) {
298298
csioptions.ControllerPublishReadOnly,
299299
*preventVolumeModeConversion,
300300
)
301-
301+
klog.Infof("enable capacity %s", *enableCapacity)
302302
var capacityController *capacity.Controller
303303
if *enableCapacity {
304304
// Publishing storage capacity information uses its own client
@@ -438,7 +438,7 @@ func StartCSIProvisioner(csioptions csioptions.CSIOptions) {
438438
claimQueue,
439439
controllerCapabilities,
440440
)
441-
441+
klog.Infof("HTTP server addr %s", addr)
442442
// Start HTTP server, regardless whether we are the leader or not.
443443
if addr != "" {
444444
// To collect metrics data from the metric handler itself, we
@@ -487,8 +487,9 @@ func StartCSIProvisioner(csioptions csioptions.CSIOptions) {
487487
provisionController.Run(ctx)
488488
}
489489

490+
klog.Infof("csioptions.EnableLeaderElection %s", csioptions.EnableLeaderElection)
490491
if !csioptions.EnableLeaderElection {
491-
run(context.TODO())
492+
run(ctx)
492493
} else {
493494
// this lock name pattern is also copied from sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller
494495
// to preserve backwards compatibility
@@ -502,6 +503,10 @@ func StartCSIProvisioner(csioptions csioptions.CSIOptions) {
502503

503504
le := leaderelection.NewLeaderElection(leClientset, lockName, run)
504505

506+
if csioptions.HttpEndpoint != "" {
507+
le.PrepareHealthCheck(mux, leaderelection.DefaultHealthCheckTimeout)
508+
}
509+
505510
if csioptions.LeaderElectionNamespace != "" {
506511
le.WithNamespace(csioptions.LeaderElectionNamespace)
507512
}

‎go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ require (
8080
k8s.io/kubernetes v1.24.1
8181
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
8282
sigs.k8s.io/controller-runtime v0.11.2
83-
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
8483
sigs.k8s.io/sig-storage-lib-external-provisioner/v8 v8.0.0
8584
)
8685

‎go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,8 +1406,6 @@ sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yN
14061406
sigs.k8s.io/kustomize/cmd/config v0.10.6/go.mod h1:/S4A4nUANUa4bZJ/Edt7ZQTyKOY9WCER0uBS1SW2Rco=
14071407
sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVYCA4BzxeAaLI05Bg=
14081408
sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg=
1409-
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0 h1:IKsKAnscMyIOqyl8s8V7guTcx0QBEa6OT57EPgAgpmM=
1410-
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0/go.mod h1:DhZ52sQMJHW21+JXyA2LRUPRIxKnrNrwh+QFV+2tVA4=
14111409
sigs.k8s.io/sig-storage-lib-external-provisioner/v8 v8.0.0 h1:vQUoaDxbberC3UwvE+zauyOMkpWlleaVgc75LoDOyy4=
14121410
sigs.k8s.io/sig-storage-lib-external-provisioner/v8 v8.0.0/go.mod h1:ejoxC3K6lnUtjUanKStWadRVnwIuyRPNJGQ4dkExDao=
14131411
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=

‎pkg/volume/provisioner/block/block.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
v1 "k8s.io/api/core/v1"
2727
"k8s.io/apimachinery/pkg/api/resource"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
29-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller"
29+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller"
3030

3131
"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"
3232
"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"

‎pkg/volume/provisioner/block/block_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
v12 "k8s.io/api/storage/v1"
3131
"k8s.io/apimachinery/pkg/api/resource"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
33-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller"
33+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller"
3434
)
3535

3636
var (

‎pkg/volume/provisioner/core/provisioner.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,13 @@ import (
3131
"go.uber.org/zap"
3232
v1 "k8s.io/api/core/v1"
3333
"k8s.io/apimachinery/pkg/api/resource"
34-
"k8s.io/apimachinery/pkg/util/wait"
35-
"k8s.io/apimachinery/pkg/version"
3634
"k8s.io/client-go/informers"
3735
informersv1 "k8s.io/client-go/informers/core/v1"
3836
"k8s.io/client-go/kubernetes"
3937
listersv1 "k8s.io/client-go/listers/core/v1"
4038
"k8s.io/client-go/tools/cache"
4139
"k8s.io/client-go/tools/clientcmd"
42-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller"
40+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller"
4341
)
4442

4543
const (
@@ -242,17 +240,6 @@ func Run(logger *zap.SugaredLogger, kubeconfig string, master string, minVolumeS
242240
return errors.Wrapf(err, "failed to create Kubernetes client")
243241
}
244242

245-
// The controller needs to know what the server version is because out-of-tree
246-
// provisioners aren't officially supported until 1.5
247-
var serverVersion *version.Info
248-
err = wait.PollUntil(15*time.Second, func() (done bool, err error) {
249-
serverVersion, err = clientset.Discovery().ServerVersion()
250-
if err != nil {
251-
logger.With(zap.Error(err)).Info("failed to get kube-apiserver version, will retry again")
252-
return false, nil
253-
}
254-
return true, nil
255-
}, stopCh)
256243
if err != nil {
257244
return errors.Wrapf(err, "failed to get kube-apiserver version")
258245
}
@@ -285,7 +272,6 @@ func Run(logger *zap.SugaredLogger, kubeconfig string, master string, minVolumeS
285272
clientset,
286273
provisionerType,
287274
ociProvisioner,
288-
serverVersion.GitVersion,
289275
controller.ResyncPeriod(resyncPeriod),
290276
controller.ExponentialBackOffOnError(exponentialBackOffOnError),
291277
controller.FailedProvisionThreshold(failedRetryThreshold),

‎pkg/volume/provisioner/fss/fss.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"go.uber.org/zap"
3030
v1 "k8s.io/api/core/v1"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
32-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller"
32+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller"
3333
)
3434

3535
const (

‎pkg/volume/provisioner/fss/fss_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"go.uber.org/zap/zaptest"
3131
v1 "k8s.io/api/core/v1"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
33-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller"
33+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller"
3434
)
3535

3636
var (

‎pkg/volume/provisioner/plugin/plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package plugin
1717
import (
1818
"github.com/oracle/oci-go-sdk/v49/identity"
1919
"k8s.io/api/core/v1"
20-
"sigs.k8s.io/sig-storage-lib-external-provisioner/v6/controller"
20+
"sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller"
2121
)
2222

2323
const (

‎vendor/k8s.io/apimachinery/pkg/util/version/doc.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)