Skip to content

Commit 3ed4ebd

Browse files
xing-yangxing-yang
committed
Use client v7
1 parent 49c81b0 commit 3ed4ebd

File tree

90 files changed

+267
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+267
-257
lines changed

‎client/hack/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Make sure to run this script after making changes to /client/apis/volumesnapshot
2626
```
2727
* Checkout latest release version
2828
```bash
29-
git checkout v0.28.1
29+
git checkout v0.29.1
3030
```
3131

3232
* Ensure the file `generate-groups.sh` exists
@@ -46,9 +46,9 @@ Once you run the script, you will get an output as follows:
4646

4747
```bash
4848
Generating deepcopy funcs
49-
Generating clientset for volumesnapshot:v1 at github.com/kubernetes-csi/external-snapshotter/client/v6/clientset
50-
Generating listers for volumesnapshot:v1 at github.com/kubernetes-csi/external-snapshotter/client/v6/listers
51-
Generating informers for volumesnapshot:v1 at github.com/kubernetes-csi/external-snapshotter/client/v6/informers
49+
Generating clientset for volumesnapshot:v1 at github.com/kubernetes-csi/external-snapshotter/client/v7/clientset
50+
Generating listers for volumesnapshot:v1 at github.com/kubernetes-csi/external-snapshotter/client/v7/listers
51+
Generating informers for volumesnapshot:v1 at github.com/kubernetes-csi/external-snapshotter/client/v7/informers
5252
5353
```
5454

‎cmd/csi-snapshotter/main.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ import (
4343
"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
4444
"github.com/kubernetes-csi/csi-lib-utils/metrics"
4545
csirpc "github.com/kubernetes-csi/csi-lib-utils/rpc"
46-
controller "github.com/kubernetes-csi/external-snapshotter/v6/pkg/sidecar-controller"
47-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/snapshotter"
48-
49-
clientset "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned"
50-
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/scheme"
51-
informers "github.com/kubernetes-csi/external-snapshotter/client/v6/informers/externalversions"
52-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/group_snapshotter"
53-
utils "github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
46+
controller "github.com/kubernetes-csi/external-snapshotter/v7/pkg/sidecar-controller"
47+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/snapshotter"
48+
49+
clientset "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned"
50+
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned/scheme"
51+
informers "github.com/kubernetes-csi/external-snapshotter/client/v7/informers/externalversions"
52+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/group_snapshotter"
53+
utils "github.com/kubernetes-csi/external-snapshotter/v7/pkg/utils"
5454
)
5555

5656
const (

‎cmd/snapshot-controller/main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ import (
4141
klog "k8s.io/klog/v2"
4242

4343
"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
44-
controller "github.com/kubernetes-csi/external-snapshotter/v6/pkg/common-controller"
45-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/metrics"
44+
controller "github.com/kubernetes-csi/external-snapshotter/v7/pkg/common-controller"
45+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/metrics"
4646

47-
clientset "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned"
48-
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/scheme"
49-
informers "github.com/kubernetes-csi/external-snapshotter/client/v6/informers/externalversions"
47+
clientset "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned"
48+
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned/scheme"
49+
informers "github.com/kubernetes-csi/external-snapshotter/client/v7/informers/externalversions"
5050
coreinformers "k8s.io/client-go/informers"
5151
)
5252

‎cmd/snapshot-validation-webhook/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"flag"
2121

22-
webhook "github.com/kubernetes-csi/external-snapshotter/v6/pkg/validation-webhook"
22+
webhook "github.com/kubernetes-csi/external-snapshotter/v7/pkg/validation-webhook"
2323
"k8s.io/klog/v2"
2424
)
2525

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kubernetes-csi/external-snapshotter/v6
1+
module github.com/kubernetes-csi/external-snapshotter/v7
22

33
go 1.21
44

@@ -10,7 +10,7 @@ require (
1010
github.com/google/gofuzz v1.2.0
1111
github.com/kubernetes-csi/csi-lib-utils v0.17.0
1212
github.com/kubernetes-csi/csi-test/v5 v5.2.0
13-
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
13+
github.com/kubernetes-csi/external-snapshotter/client/v7 v7.0.0
1414
github.com/prometheus/client_golang v1.18.0
1515
github.com/prometheus/client_model v0.5.0
1616
github.com/prometheus/common v0.46.0
@@ -75,7 +75,7 @@ require (
7575
sigs.k8s.io/yaml v1.3.0 // indirect
7676
)
7777

78-
replace github.com/kubernetes-csi/external-snapshotter/client/v6 => ./client
78+
replace github.com/kubernetes-csi/external-snapshotter/client/v7 => ./client
7979

8080
replace k8s.io/api => k8s.io/api v0.29.0
8181

‎pkg/common-controller/framework_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ import (
3131
"time"
3232

3333
jsonpatch "github.com/evanphx/json-patch"
34-
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
35-
clientset "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned"
36-
"github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/fake"
37-
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned/scheme"
38-
informers "github.com/kubernetes-csi/external-snapshotter/client/v6/informers/externalversions"
39-
storagelisters "github.com/kubernetes-csi/external-snapshotter/client/v6/listers/volumesnapshot/v1"
40-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/metrics"
41-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
34+
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
35+
clientset "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned"
36+
"github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned/fake"
37+
snapshotscheme "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned/scheme"
38+
informers "github.com/kubernetes-csi/external-snapshotter/client/v7/informers/externalversions"
39+
storagelisters "github.com/kubernetes-csi/external-snapshotter/client/v7/listers/volumesnapshot/v1"
40+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/metrics"
41+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/utils"
4242
v1 "k8s.io/api/core/v1"
4343
"k8s.io/apimachinery/pkg/api/resource"
4444
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/common-controller/groupsnapshot_controller_helper.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import (
3030
ref "k8s.io/client-go/tools/reference"
3131
klog "k8s.io/klog/v2"
3232

33-
crdv1alpha1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumegroupsnapshot/v1alpha1"
34-
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
35-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
33+
crdv1alpha1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumegroupsnapshot/v1alpha1"
34+
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
35+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/utils"
3636
)
3737

3838
func (ctrl *csiSnapshotCommonController) storeGroupSnapshotUpdate(groupsnapshot interface{}) (bool, error) {

‎pkg/common-controller/snapshot_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ import (
3232
corev1helpers "k8s.io/component-helpers/scheduling/corev1"
3333
klog "k8s.io/klog/v2"
3434

35-
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
36-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/metrics"
37-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
38-
webhook "github.com/kubernetes-csi/external-snapshotter/v6/pkg/validation-webhook"
35+
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
36+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/metrics"
37+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/utils"
38+
webhook "github.com/kubernetes-csi/external-snapshotter/v7/pkg/validation-webhook"
3939
)
4040

4141
// ==================================================================

‎pkg/common-controller/snapshot_controller_base.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import (
2020
"fmt"
2121
"time"
2222

23-
crdv1alpha1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumegroupsnapshot/v1alpha1"
24-
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
25-
clientset "github.com/kubernetes-csi/external-snapshotter/client/v6/clientset/versioned"
26-
groupsnapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v6/informers/externalversions/volumegroupsnapshot/v1alpha1"
27-
snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v6/informers/externalversions/volumesnapshot/v1"
28-
groupsnapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v6/listers/volumegroupsnapshot/v1alpha1"
29-
snapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v6/listers/volumesnapshot/v1"
30-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/metrics"
31-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
23+
crdv1alpha1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumegroupsnapshot/v1alpha1"
24+
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
25+
clientset "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned"
26+
groupsnapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v7/informers/externalversions/volumegroupsnapshot/v1alpha1"
27+
snapshotinformers "github.com/kubernetes-csi/external-snapshotter/client/v7/informers/externalversions/volumesnapshot/v1"
28+
groupsnapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v7/listers/volumegroupsnapshot/v1alpha1"
29+
snapshotlisters "github.com/kubernetes-csi/external-snapshotter/client/v7/listers/volumesnapshot/v1"
30+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/metrics"
31+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/utils"
3232

3333
v1 "k8s.io/api/core/v1"
3434
"k8s.io/apimachinery/pkg/api/errors"

‎pkg/common-controller/snapshot_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package common_controller
1919
import (
2020
"testing"
2121

22-
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
23-
"github.com/kubernetes-csi/external-snapshotter/v6/pkg/utils"
22+
crdv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
23+
"github.com/kubernetes-csi/external-snapshotter/v7/pkg/utils"
2424
v1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/labels"

0 commit comments

Comments
 (0)