Skip to content

Commit b70f559

Browse files
anchaubeYashwantGohokar
anchaube
authored and
YashwantGohokar
committed
Changes for CCM/CSI v0.29.1
1 parent e760640 commit b70f559

File tree

346 files changed

+18434
-10085
lines changed

Some content is hidden

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

346 files changed

+18434
-10085
lines changed

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ const (
2626
fssAddressSuffix = "-fss.sock"
2727
fssVolumeNameAppendedPrefix = "-fss"
2828
CrossNamespaceVolumeDataSource = "CrossNamespaceVolumeDataSource"
29+
VolumeAttributesClass = "VolumeAttributesClass"
2930
)
3031

31-
// CSIOptions structure which contains flag values
32+
//CSIOptions structure which contains flag values
3233
type CSIOptions struct {
3334
Master string
3435
Kubeconfig string
@@ -57,9 +58,12 @@ type CSIOptions struct {
5758
ExtraCreateMetadata bool
5859
ReconcileSync time.Duration
5960
EnableResizer bool
61+
GroupSnapshotNamePrefix string
62+
GroupSnapshotNameUUIDLength int
63+
EnableNodeDeployment bool
6064
}
6165

62-
// NewCSIOptions initializes the flag
66+
//NewCSIOptions initializes the flag
6367
func NewCSIOptions() *CSIOptions {
6468
csioptions := CSIOptions{
6569
Master: *flag.String("master", "", "kube master"),
@@ -88,6 +92,9 @@ func NewCSIOptions() *CSIOptions {
8892
ExtraCreateMetadata: *flag.Bool("extra-create-metadata", false, "If set, add pv/pvc metadata to plugin create requests as parameters."),
8993
ReconcileSync: *flag.Duration("reconcile-sync", 1*time.Minute, "Resync interval of the VolumeAttachment reconciler."),
9094
EnableResizer: *flag.Bool("csi-bv-expansion-enabled", false, "Enables go routine csi-resizer."),
95+
GroupSnapshotNamePrefix: *flag.String("groupsnapshot-name-prefix", "groupsnapshot", "Prefix to apply to the name of a created group snapshot"),
96+
GroupSnapshotNameUUIDLength: *flag.Int("groupsnapshot-name-uuid-length", -1, "Length in characters for the generated uuid of a created group snapshot. Defaults behavior is to NOT truncate."),
97+
EnableNodeDeployment: *flag.Bool("node-deployment", false, "Enables deploying the sidecar controller together with a CSI driver on nodes to manage snapshots for node-local volumes."),
9198
}
9299
return &csioptions
93100
}
@@ -110,10 +117,15 @@ func GetFssVolumeNamePrefix(csiVolumeNamePrefix string) string {
110117
}
111118

112119
// UpdateFeatureGates add CrossNamespaceVolumeDataSource (default value false) to featureGate if not present
120+
// add VolumeAttributesClass (default value false) to featureGate if not present
121+
113122
func UpdateFeatureGates(featureGate map[string]bool) map[string]bool {
114123
//If key does not exist
115124
if featureGate != nil && !featureGate[CrossNamespaceVolumeDataSource] {
116125
featureGate[CrossNamespaceVolumeDataSource] = false
117126
}
127+
if featureGate != nil && !featureGate[VolumeAttributesClass] {
128+
featureGate[VolumeAttributesClass] = false
129+
}
118130
return featureGate
119131
}

‎go.mod

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,80 @@ go 1.21
55
replace (
66
github.com/docker/docker => github.com/docker/engine v0.0.0-20181106193140-f5749085e9cb
77
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.16.0
8-
google.golang.org/grpc => google.golang.org/grpc v1.61.0
9-
k8s.io/api => k8s.io/api v0.29.0
10-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
11-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
12-
k8s.io/apiserver => k8s.io/apiserver v0.29.0
13-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
14-
k8s.io/client-go => k8s.io/client-go v0.29.0
15-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
16-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
17-
k8s.io/code-generator => k8s.io/code-generator v0.29.0
18-
k8s.io/component-base => k8s.io/component-base v0.29.0
19-
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
20-
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
21-
k8s.io/cri-api => k8s.io/cri-api v0.29.0
22-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
23-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
8+
google.golang.org/grpc => google.golang.org/grpc v1.60.1
9+
k8s.io/api => k8s.io/api v0.29.1
10+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.1
11+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.1
12+
k8s.io/apiserver => k8s.io/apiserver v0.29.1
13+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.1
14+
k8s.io/client-go => k8s.io/client-go v0.29.1
15+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.1
16+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.1
17+
k8s.io/code-generator => k8s.io/code-generator v0.29.1
18+
k8s.io/component-base => k8s.io/component-base v0.29.1
19+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.1
20+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.1
21+
k8s.io/cri-api => k8s.io/cri-api v0.29.1
22+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.1
23+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.1
2424
k8s.io/endpointslice => k8s.io/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20230810203337-add7e14df11e
25-
k8s.io/kms => k8s.io/kms v0.29.0
26-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
27-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
28-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
29-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
30-
k8s.io/kubectl => k8s.io/kubectl v0.29.0
31-
k8s.io/kubelet => k8s.io/kubelet v0.29.0
32-
k8s.io/kubernetes => k8s.io/kubernetes v1.29.0
33-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
34-
k8s.io/metrics => k8s.io/metrics v0.29.0
35-
k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
36-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
37-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
25+
k8s.io/kms => k8s.io/kms v0.29.1
26+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.1
27+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.1
28+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.1
29+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.1
30+
k8s.io/kubectl => k8s.io/kubectl v0.29.1
31+
k8s.io/kubelet => k8s.io/kubelet v0.29.1
32+
k8s.io/kubernetes => k8s.io/kubernetes v1.29.1
33+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.1
34+
k8s.io/metrics => k8s.io/metrics v0.29.1
35+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.1
36+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.1
37+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.1
3838
)
3939

4040
require (
4141
github.com/container-storage-interface/spec v1.9.0
4242
github.com/go-logr/zapr v1.2.4 // indirect
4343
github.com/golang/protobuf v1.5.3
4444
github.com/kubernetes-csi/csi-lib-utils v0.17.0
45-
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
45+
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
4646
github.com/onsi/ginkgo v1.16.5
47-
github.com/onsi/gomega v1.29.0
47+
github.com/onsi/gomega v1.30.0
4848
github.com/oracle/oci-go-sdk/v65 v65.56.0
4949
github.com/pkg/errors v0.9.1
50-
github.com/prometheus/client_golang v1.16.0
51-
github.com/spf13/cobra v1.7.0 // indirect
50+
github.com/prometheus/client_golang v1.17.0
51+
github.com/spf13/cobra v1.8.0 // indirect
5252
github.com/spf13/pflag v1.0.5
5353
github.com/spf13/viper v1.8.1
54-
go.uber.org/zap v1.25.0
55-
golang.org/x/net v0.20.0
56-
golang.org/x/sys v0.16.0 // indirect
57-
google.golang.org/grpc v1.61.0
54+
go.uber.org/zap v1.26.0
55+
golang.org/x/net v0.19.0
56+
golang.org/x/sys v0.15.0 // indirect
57+
google.golang.org/grpc v1.60.1
5858
gopkg.in/natefinch/lumberjack.v2 v2.2.1
5959
gopkg.in/yaml.v2 v2.4.0
60-
k8s.io/api v0.29.0
61-
k8s.io/apimachinery v0.29.0
62-
k8s.io/apiserver v0.29.0 // indirect
63-
k8s.io/client-go v0.29.0
64-
k8s.io/cloud-provider v0.29.0
65-
k8s.io/component-base v0.29.0
66-
k8s.io/component-helpers v0.29.0
67-
k8s.io/controller-manager v0.29.0 // indirect
68-
k8s.io/csi-translation-lib v0.29.0 // indirect
60+
k8s.io/api v0.29.1
61+
k8s.io/apimachinery v0.29.1
62+
k8s.io/apiserver v0.29.1 // indirect
63+
k8s.io/client-go v1.5.2
64+
k8s.io/cloud-provider v0.29.1
65+
k8s.io/component-base v0.29.1
66+
k8s.io/component-helpers v0.29.1
67+
k8s.io/controller-manager v0.29.1 // indirect
68+
k8s.io/csi-translation-lib v0.29.1 // indirect
6969
k8s.io/klog v1.0.0
7070
k8s.io/klog/v2 v2.110.1
71-
k8s.io/kubelet v0.29.0 // indirect
72-
k8s.io/kubernetes v1.29.0
73-
k8s.io/mount-utils v0.29.0
71+
k8s.io/kubelet v0.29.1 // indirect
72+
k8s.io/kubernetes v1.29.1
73+
k8s.io/mount-utils v0.29.1
7474
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
7575
sigs.k8s.io/sig-storage-lib-external-provisioner/v9 v9.1.0-rc.0
7676
)
7777

7878
require (
7979
golang.org/x/sync v0.5.0
80-
google.golang.org/protobuf v1.32.0
81-
k8s.io/apiextensions-apiserver v0.29.0
80+
google.golang.org/protobuf v1.31.0
81+
k8s.io/apiextensions-apiserver v0.29.1
8282
)
8383

8484
require (
@@ -88,7 +88,6 @@ require (
8888
github.com/NYTimes/gziphandler v1.1.1 // indirect
8989
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
9090
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
91-
github.com/benbjohnson/clock v1.3.0 // indirect
9291
github.com/beorn7/perks v1.0.1 // indirect
9392
github.com/blang/semver/v4 v4.0.0 // indirect
9493
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -99,13 +98,13 @@ require (
9998
github.com/distribution/reference v0.5.0 // indirect
10099
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
101100
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
102-
github.com/felixge/httpsnoop v1.0.3 // indirect
101+
github.com/felixge/httpsnoop v1.0.4 // indirect
103102
github.com/fsnotify/fsnotify v1.7.0 // indirect
104103
github.com/go-logr/logr v1.3.0 // indirect
105104
github.com/go-logr/stdr v1.2.2 // indirect
106-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
107-
github.com/go-openapi/jsonreference v0.20.2 // indirect
108-
github.com/go-openapi/swag v0.22.4 // indirect
105+
github.com/go-openapi/jsonpointer v0.20.1 // indirect
106+
github.com/go-openapi/jsonreference v0.20.3 // indirect
107+
github.com/go-openapi/swag v0.22.5 // indirect
109108
github.com/go-task/slim-sprig v2.20.0+incompatible // indirect
110109
github.com/gofrs/flock v0.8.1 // indirect
111110
github.com/gogo/protobuf v1.3.2 // indirect
@@ -114,76 +113,77 @@ require (
114113
github.com/google/gnostic-models v0.6.8 // indirect
115114
github.com/google/go-cmp v0.6.0 // indirect
116115
github.com/google/gofuzz v1.2.0 // indirect
117-
github.com/google/uuid v1.4.0 // indirect
118-
github.com/gorilla/websocket v1.5.0 // indirect
116+
github.com/google/uuid v1.5.0 // indirect
117+
github.com/gorilla/websocket v1.5.1 // indirect
119118
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
120-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
119+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
121120
github.com/hashicorp/hcl v1.0.0 // indirect
122121
github.com/huandu/xstrings v1.4.0 // indirect
123-
github.com/imdario/mergo v0.3.13 // indirect
122+
github.com/imdario/mergo v0.3.16 // indirect
124123
github.com/inconshreveable/mousetrap v1.1.0 // indirect
125124
github.com/josharian/intern v1.0.0 // indirect
126125
github.com/json-iterator/go v1.1.12 // indirect
127126
github.com/magiconair/properties v1.8.5 // indirect
128127
github.com/mailru/easyjson v0.7.7 // indirect
129-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
130-
github.com/miekg/dns v1.1.55 // indirect
128+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
129+
github.com/miekg/dns v1.1.57 // indirect
131130
github.com/mitchellh/mapstructure v1.4.1 // indirect
132131
github.com/moby/spdystream v0.2.0 // indirect
133-
github.com/moby/sys/mountinfo v0.6.2 // indirect
132+
github.com/moby/sys/mountinfo v0.7.1 // indirect
134133
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
135134
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
136135
github.com/modern-go/reflect2 v1.0.2 // indirect
137136
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
138137
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
139138
github.com/nxadm/tail v1.4.8 // indirect
139+
github.com/onsi/ginkgo/v2 v2.13.2 // indirect
140140
github.com/opencontainers/go-digest v1.0.0 // indirect
141141
github.com/opencontainers/selinux v1.11.0 // indirect
142142
github.com/pelletier/go-toml v1.9.3 // indirect
143-
github.com/prometheus/client_model v0.4.0 // indirect
144-
github.com/prometheus/common v0.44.0 // indirect
145-
github.com/prometheus/procfs v0.11.1 // indirect
143+
github.com/prometheus/client_model v0.5.0 // indirect
144+
github.com/prometheus/common v0.45.0 // indirect
145+
github.com/prometheus/procfs v0.12.0 // indirect
146146
github.com/sony/gobreaker v0.5.0 // indirect
147147
github.com/spf13/afero v1.9.2 // indirect
148148
github.com/spf13/cast v1.3.1 // indirect
149149
github.com/spf13/jwalterweatherman v1.1.0 // indirect
150150
github.com/stoewer/go-strcase v1.3.0 // indirect
151151
github.com/subosito/gotenv v1.2.0 // indirect
152-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
153-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
154-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
155-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.44.0 // indirect
156-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
157-
go.opentelemetry.io/otel v1.19.0 // indirect
158-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
159-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
160-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
161-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
162-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
152+
go.etcd.io/etcd/api/v3 v3.5.11 // indirect
153+
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
154+
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
155+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
156+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
157+
go.opentelemetry.io/otel v1.21.0 // indirect
158+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
159+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
160+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
161+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
162+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
163163
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
164164
go.uber.org/multierr v1.11.0 // indirect
165-
golang.org/x/crypto v0.18.0 // indirect
166-
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
167-
golang.org/x/mod v0.12.0 // indirect
165+
golang.org/x/crypto v0.17.0 // indirect
166+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
167+
golang.org/x/mod v0.14.0 // indirect
168168
golang.org/x/oauth2 v0.15.0 // indirect
169-
golang.org/x/term v0.16.0 // indirect
169+
golang.org/x/term v0.15.0 // indirect
170170
golang.org/x/text v0.14.0 // indirect
171-
golang.org/x/time v0.3.0 // indirect
172-
golang.org/x/tools v0.12.0 // indirect
171+
golang.org/x/time v0.5.0 // indirect
172+
golang.org/x/tools v0.16.1 // indirect
173173
google.golang.org/appengine v1.6.8 // indirect
174-
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
175-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
176-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
174+
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
175+
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
176+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
177177
gopkg.in/inf.v0 v0.9.1 // indirect
178178
gopkg.in/ini.v1 v1.62.0 // indirect
179179
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
180180
gopkg.in/yaml.v3 v3.0.1 // indirect
181-
k8s.io/kms v0.29.0 // indirect
181+
k8s.io/kms v0.29.1 // indirect
182182
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
183183
k8s.io/kube-scheduler v0.0.0 // indirect
184-
k8s.io/kubectl v0.29.0 // indirect
185-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
184+
k8s.io/kubectl v0.29.1 // indirect
185+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.3 // indirect
186186
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
187187
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
188-
sigs.k8s.io/yaml v1.3.0 // indirect
188+
sigs.k8s.io/yaml v1.4.0 // indirect
189189
)

0 commit comments

Comments
 (0)