Skip to content

Commit 5ccf2fe

Browse files
authored
Merge pull request #733 from humblec/version
use latest controllers and webhook in the deployment
2 parents 04006d2 + 6dba891 commit 5ccf2fe

File tree

210 files changed

+14465
-3360
lines changed

Some content is hidden

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

210 files changed

+14465
-3360
lines changed

client/go.mod

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/kubernetes-csi/external-snapshotter/client/v6
33
go 1.17
44

55
require (
6-
k8s.io/api v0.23.0
7-
k8s.io/apimachinery v0.23.0
8-
k8s.io/client-go v0.23.0
9-
k8s.io/code-generator v0.23.0
6+
k8s.io/api v0.24.3
7+
k8s.io/apimachinery v0.24.3
8+
k8s.io/client-go v0.24.3
9+
k8s.io/code-generator v0.24.3
1010
)
1111

1212
require (
@@ -21,37 +21,38 @@ require (
2121
github.com/go-openapi/swag v0.19.14 // indirect
2222
github.com/gogo/protobuf v1.3.2 // indirect
2323
github.com/golang/protobuf v1.5.2 // indirect
24+
github.com/google/gnostic v0.5.7-v3refs // indirect
2425
github.com/google/go-cmp v0.5.6 // indirect
2526
github.com/google/gofuzz v1.1.0 // indirect
26-
github.com/googleapis/gnostic v0.5.5 // indirect
2727
github.com/josharian/intern v1.0.0 // indirect
2828
github.com/json-iterator/go v1.1.12 // indirect
2929
github.com/mailru/easyjson v0.7.6 // indirect
3030
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3131
github.com/modern-go/reflect2 v1.0.2 // indirect
32+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3233
github.com/onsi/ginkgo v1.16.5 // indirect
3334
github.com/onsi/gomega v1.17.0 // indirect
3435
github.com/pkg/errors v0.9.1 // indirect
3536
github.com/spf13/pflag v1.0.5 // indirect
36-
golang.org/x/mod v0.4.2 // indirect
37-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
38-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
39-
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
40-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
37+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
38+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
39+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
40+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
41+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
4142
golang.org/x/text v0.3.7 // indirect
42-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
43-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
43+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
44+
golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 // indirect
4445
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
4546
google.golang.org/appengine v1.6.7 // indirect
4647
google.golang.org/protobuf v1.27.1 // indirect
4748
gopkg.in/inf.v0 v0.9.1 // indirect
4849
gopkg.in/yaml.v2 v2.4.0 // indirect
4950
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
50-
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
51-
k8s.io/klog/v2 v2.30.0 // indirect
52-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
53-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
54-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
55-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
51+
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
52+
k8s.io/klog/v2 v2.60.1 // indirect
53+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
54+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
55+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
56+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
5657
sigs.k8s.io/yaml v1.3.0 // indirect
5758
)

client/go.sum

Lines changed: 46 additions & 39 deletions
Large diffs are not rendered by default.

examples/kubernetes/restore.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
storageClassName: csi-hostpath-sc
77
dataSource:
8-
name: new-snapshot-demo
8+
name: new-snapshot-demo-v1
99
kind: VolumeSnapshot
1010
apiGroup: snapshot.storage.k8s.io
1111
accessModes:

go.mod

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ require (
1717
github.com/prometheus/common v0.32.1
1818
github.com/spf13/cobra v1.4.0
1919
google.golang.org/grpc v1.40.0
20-
k8s.io/api v0.24.0
21-
k8s.io/apimachinery v0.24.0
22-
k8s.io/client-go v0.24.0
23-
k8s.io/component-base v0.24.0
24-
k8s.io/component-helpers v0.24.0
20+
k8s.io/api v0.24.3
21+
k8s.io/apimachinery v0.24.3
22+
k8s.io/client-go v0.24.3
23+
k8s.io/component-base v0.24.3
24+
k8s.io/component-helpers v0.24.3
2525
k8s.io/klog/v2 v2.60.1
26-
k8s.io/kubernetes v1.23.0
26+
k8s.io/kubernetes v1.24.3
2727
)
2828

2929
require (
@@ -33,7 +33,7 @@ require (
3333
github.com/blang/semver/v4 v4.0.0 // indirect
3434
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3535
github.com/davecgh/go-spew v1.1.1 // indirect
36-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
36+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
3737
github.com/go-logr/logr v1.2.0 // indirect
3838
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3939
github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -51,13 +51,12 @@ require (
5151
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5252
github.com/modern-go/reflect2 v1.0.2 // indirect
5353
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
54-
github.com/nxadm/tail v1.4.8 // indirect
5554
github.com/pkg/errors v0.9.1 // indirect
5655
github.com/prometheus/procfs v0.7.3 // indirect
5756
github.com/spf13/pflag v1.0.5 // indirect
58-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
57+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
5958
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
60-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
59+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
6160
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
6261
golang.org/x/text v0.3.7 // indirect
6362
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
@@ -68,7 +67,7 @@ require (
6867
gopkg.in/yaml.v2 v2.4.0 // indirect
6968
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
7069
k8s.io/klog v1.0.0 // indirect
71-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
70+
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
7271
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
7372
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
7473
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
@@ -77,31 +76,31 @@ require (
7776

7877
replace (
7978
github.com/kubernetes-csi/external-snapshotter/client/v6 => ./client
80-
k8s.io/api => k8s.io/api v0.24.0
81-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
82-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
83-
k8s.io/apiserver => k8s.io/apiserver v0.24.0
84-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
85-
k8s.io/client-go => k8s.io/client-go v0.24.0
86-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
87-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
88-
k8s.io/code-generator => k8s.io/code-generator v0.24.0
89-
k8s.io/component-base => k8s.io/component-base v0.24.0
90-
k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
91-
k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
92-
k8s.io/cri-api => k8s.io/cri-api v0.24.0
93-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
94-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
95-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
96-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
97-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
98-
k8s.io/kubectl => k8s.io/kubectl v0.24.0
99-
k8s.io/kubelet => k8s.io/kubelet v0.24.0
100-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
101-
k8s.io/metrics => k8s.io/metrics v0.24.0
102-
k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
103-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
104-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
105-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.0
106-
k8s.io/sample-controller => k8s.io/sample-controller v0.24.0
79+
k8s.io/api => k8s.io/api v0.24.3
80+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.3
81+
k8s.io/apimachinery => k8s.io/apimachinery v0.24.3
82+
k8s.io/apiserver => k8s.io/apiserver v0.24.3
83+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.3
84+
k8s.io/client-go => k8s.io/client-go v0.24.3
85+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.3
86+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.3
87+
k8s.io/code-generator => k8s.io/code-generator v0.24.3
88+
k8s.io/component-base => k8s.io/component-base v0.24.3
89+
k8s.io/component-helpers => k8s.io/component-helpers v0.24.3
90+
k8s.io/controller-manager => k8s.io/controller-manager v0.24.3
91+
k8s.io/cri-api => k8s.io/cri-api v0.24.3
92+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.3
93+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.3
94+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.3
95+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.3
96+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.3
97+
k8s.io/kubectl => k8s.io/kubectl v0.24.3
98+
k8s.io/kubelet => k8s.io/kubelet v0.24.3
99+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.3
100+
k8s.io/metrics => k8s.io/metrics v0.24.3
101+
k8s.io/mount-utils => k8s.io/mount-utils v0.24.3
102+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.3
103+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.3
104+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.3
105+
k8s.io/sample-controller => k8s.io/sample-controller v0.24.3
107106
)

0 commit comments

Comments
 (0)