diff --git a/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml b/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml index c051729b7..9bc216a5a 100644 --- a/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml +++ b/deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml @@ -5,3 +5,4 @@ includedPermissions: - compute.instances.get - compute.instances.attachDisk - compute.instances.detachDisk +- compute.disks.get diff --git a/deploy/kubernetes/base/node_windows/node.yaml b/deploy/kubernetes/base/node_windows/node.yaml index 4e7d69401..09c55cff6 100644 --- a/deploy/kubernetes/base/node_windows/node.yaml +++ b/deploy/kubernetes/base/node_windows/node.yaml @@ -19,7 +19,7 @@ spec: # when deploying on GKE Windows node. # hostNetwork: true priorityClassName: csi-gce-pd-node - serviceAccountName: csi-gce-pd-node-sa + serviceAccountName: csi-gce-pd-node-sa-win nodeSelector: kubernetes.io/os: windows containers: @@ -57,7 +57,7 @@ spec: - name: csi-proxy-volume-pipe mountPath: \\.\pipe\csi-proxy-volume-v1beta1 - name: csi-proxy-filesystem-pipe - mountPath: \\.\pipe\csi-proxy-filesystem-v1alpha1 + mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1 volumes: - name: csi-proxy-disk-pipe hostPath: @@ -69,7 +69,7 @@ spec: type: "" - name: csi-proxy-filesystem-pipe hostPath: - path: \\.\pipe\csi-proxy-filesystem-v1alpha1 + path: \\.\pipe\csi-proxy-filesystem-v1beta1 type: "" - name: registration-dir hostPath: diff --git a/deploy/kubernetes/base/node_windows/psp.yaml b/deploy/kubernetes/base/node_windows/psp.yaml index bba222a40..1863cb9df 100644 --- a/deploy/kubernetes/base/node_windows/psp.yaml +++ b/deploy/kubernetes/base/node_windows/psp.yaml @@ -20,5 +20,5 @@ spec: - pathPrefix: \var\lib\kubelet\plugins\pd.csi.storage.gke.io - pathPrefix: \\.\pipe\csi-proxy-disk-v1beta1 - pathPrefix: \\.\pipe\csi-proxy-volume-v1beta1 - - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1alpha1 + - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1beta1 diff --git a/deploy/kubernetes/images/alpha/image.yaml b/deploy/kubernetes/images/alpha/image.yaml index 311ad9069..d9a9142d6 100644 --- a/deploy/kubernetes/images/alpha/image.yaml +++ b/deploy/kubernetes/images/alpha/image.yaml @@ -4,8 +4,8 @@ metadata: name: imagetag-gcepd-driver-alpha-win imageTag: name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win - newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver-amd64-windows-1909 - newTag: "cca3c14" + newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver + newTag: "v1.0.1-gke.9" --- apiVersion: builtin diff --git a/go.mod b/go.mod index a68fe3129..d40b73ce2 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/golang/protobuf v1.4.1 github.com/google/uuid v1.1.1 github.com/hashicorp/go-multierror v1.0.0 // indirect - github.com/kubernetes-csi/csi-proxy/client v0.2.0 + github.com/kubernetes-csi/csi-proxy/client v0.2.1 github.com/kubernetes-csi/csi-test/v3 v3.0.0 github.com/onsi/ginkgo v1.11.0 github.com/onsi/gomega v1.7.1 diff --git a/go.sum b/go.sum index ea95bdbeb..4676080be 100644 --- a/go.sum +++ b/go.sum @@ -420,6 +420,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kubernetes-csi/csi-proxy/client v0.2.0 h1:O801ogdqIJXhwABFfe9JRtz3N6hI0HxYdcDDnZzYQCk= github.com/kubernetes-csi/csi-proxy/client v0.2.0/go.mod h1:6ptQQmti5QHwBxSsh8Cy00oGdogj0JXewFnu8FFjgOs= +github.com/kubernetes-csi/csi-proxy/client v0.2.1 h1:n21d2U9HvgQ6jfJayafRv8kXXtLvnRNEqoD0mQNucKc= +github.com/kubernetes-csi/csi-proxy/client v0.2.1/go.mod h1:6ptQQmti5QHwBxSsh8Cy00oGdogj0JXewFnu8FFjgOs= github.com/kubernetes-csi/csi-test/v3 v3.0.0 h1:mVsfA4J67uNm8fdF/Pr84oMqL92qjIhjWbEUH8zv1fU= github.com/kubernetes-csi/csi-test/v3 v3.0.0/go.mod h1:VdIKGnDZHOjg4M5yd0OZICtsoEzdn64d0K33N6dm35Q= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= diff --git a/pkg/mount-manager/safe-mounter_windows.go b/pkg/mount-manager/safe-mounter_windows.go index eb2a08ae5..fbc278809 100644 --- a/pkg/mount-manager/safe-mounter_windows.go +++ b/pkg/mount-manager/safe-mounter_windows.go @@ -27,8 +27,8 @@ import ( diskapi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1" diskclient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1" - fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1" - fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1" + fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1" + fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1" volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1" volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1" diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.pb.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.pb.go similarity index 84% rename from vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.pb.go rename to vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.pb.go index 9d10268b3..9b8f897bd 100644 --- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.pb.go +++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.proto +// source: github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.proto -package v1alpha1 +package v1beta1 import ( context "context" @@ -55,7 +55,7 @@ func (x PathContext) String() string { } func (PathContext) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{0} + return fileDescriptor_b03a6091226f91c2, []int{0} } type PathExistsRequest struct { @@ -63,7 +63,7 @@ type PathExistsRequest struct { Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` // Context of the path parameter. // This is used to validate prefix for absolute paths passed - Context PathContext `protobuf:"varint,2,opt,name=context,proto3,enum=v1alpha1.PathContext" json:"context,omitempty"` + Context PathContext `protobuf:"varint,2,opt,name=context,proto3,enum=v1beta1.PathContext" json:"context,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -73,7 +73,7 @@ func (m *PathExistsRequest) Reset() { *m = PathExistsRequest{} } func (m *PathExistsRequest) String() string { return proto.CompactTextString(m) } func (*PathExistsRequest) ProtoMessage() {} func (*PathExistsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{0} + return fileDescriptor_b03a6091226f91c2, []int{0} } func (m *PathExistsRequest) XXX_Unmarshal(b []byte) error { @@ -122,7 +122,7 @@ func (m *PathExistsResponse) Reset() { *m = PathExistsResponse{} } func (m *PathExistsResponse) String() string { return proto.CompactTextString(m) } func (*PathExistsResponse) ProtoMessage() {} func (*PathExistsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{1} + return fileDescriptor_b03a6091226f91c2, []int{1} } func (m *PathExistsResponse) XXX_Unmarshal(b []byte) error { @@ -179,7 +179,7 @@ type MkdirRequest struct { Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` // Context of the path parameter. // This is used to validate prefix for absolute paths passed - Context PathContext `protobuf:"varint,2,opt,name=context,proto3,enum=v1alpha1.PathContext" json:"context,omitempty"` + Context PathContext `protobuf:"varint,2,opt,name=context,proto3,enum=v1beta1.PathContext" json:"context,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -189,7 +189,7 @@ func (m *MkdirRequest) Reset() { *m = MkdirRequest{} } func (m *MkdirRequest) String() string { return proto.CompactTextString(m) } func (*MkdirRequest) ProtoMessage() {} func (*MkdirRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{2} + return fileDescriptor_b03a6091226f91c2, []int{2} } func (m *MkdirRequest) XXX_Unmarshal(b []byte) error { @@ -236,7 +236,7 @@ func (m *MkdirResponse) Reset() { *m = MkdirResponse{} } func (m *MkdirResponse) String() string { return proto.CompactTextString(m) } func (*MkdirResponse) ProtoMessage() {} func (*MkdirResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{3} + return fileDescriptor_b03a6091226f91c2, []int{3} } func (m *MkdirResponse) XXX_Unmarshal(b []byte) error { @@ -283,7 +283,7 @@ type RmdirRequest struct { Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` // Context of the path parameter. // This is used to validate prefix for absolute paths passed - Context PathContext `protobuf:"varint,2,opt,name=context,proto3,enum=v1alpha1.PathContext" json:"context,omitempty"` + Context PathContext `protobuf:"varint,2,opt,name=context,proto3,enum=v1beta1.PathContext" json:"context,omitempty"` // Force remove all contents under path (if any). Force bool `protobuf:"varint,3,opt,name=force,proto3" json:"force,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -295,7 +295,7 @@ func (m *RmdirRequest) Reset() { *m = RmdirRequest{} } func (m *RmdirRequest) String() string { return proto.CompactTextString(m) } func (*RmdirRequest) ProtoMessage() {} func (*RmdirRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{4} + return fileDescriptor_b03a6091226f91c2, []int{4} } func (m *RmdirRequest) XXX_Unmarshal(b []byte) error { @@ -349,7 +349,7 @@ func (m *RmdirResponse) Reset() { *m = RmdirResponse{} } func (m *RmdirResponse) String() string { return proto.CompactTextString(m) } func (*RmdirResponse) ProtoMessage() {} func (*RmdirResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{5} + return fileDescriptor_b03a6091226f91c2, []int{5} } func (m *RmdirResponse) XXX_Unmarshal(b []byte) error { @@ -418,7 +418,7 @@ func (m *LinkPathRequest) Reset() { *m = LinkPathRequest{} } func (m *LinkPathRequest) String() string { return proto.CompactTextString(m) } func (*LinkPathRequest) ProtoMessage() {} func (*LinkPathRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{6} + return fileDescriptor_b03a6091226f91c2, []int{6} } func (m *LinkPathRequest) XXX_Unmarshal(b []byte) error { @@ -465,7 +465,7 @@ func (m *LinkPathResponse) Reset() { *m = LinkPathResponse{} } func (m *LinkPathResponse) String() string { return proto.CompactTextString(m) } func (*LinkPathResponse) ProtoMessage() {} func (*LinkPathResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{7} + return fileDescriptor_b03a6091226f91c2, []int{7} } func (m *LinkPathResponse) XXX_Unmarshal(b []byte) error { @@ -505,7 +505,7 @@ func (m *IsMountPointRequest) Reset() { *m = IsMountPointRequest{} } func (m *IsMountPointRequest) String() string { return proto.CompactTextString(m) } func (*IsMountPointRequest) ProtoMessage() {} func (*IsMountPointRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{8} + return fileDescriptor_b03a6091226f91c2, []int{8} } func (m *IsMountPointRequest) XXX_Unmarshal(b []byte) error { @@ -547,7 +547,7 @@ func (m *IsMountPointResponse) Reset() { *m = IsMountPointResponse{} } func (m *IsMountPointResponse) String() string { return proto.CompactTextString(m) } func (*IsMountPointResponse) ProtoMessage() {} func (*IsMountPointResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_78274760fcbff95c, []int{9} + return fileDescriptor_b03a6091226f91c2, []int{9} } func (m *IsMountPointResponse) XXX_Unmarshal(b []byte) error { @@ -583,63 +583,63 @@ func (m *IsMountPointResponse) GetIsMountPoint() bool { } func init() { - proto.RegisterEnum("v1alpha1.PathContext", PathContext_name, PathContext_value) - proto.RegisterType((*PathExistsRequest)(nil), "v1alpha1.PathExistsRequest") - proto.RegisterType((*PathExistsResponse)(nil), "v1alpha1.PathExistsResponse") - proto.RegisterType((*MkdirRequest)(nil), "v1alpha1.MkdirRequest") - proto.RegisterType((*MkdirResponse)(nil), "v1alpha1.MkdirResponse") - proto.RegisterType((*RmdirRequest)(nil), "v1alpha1.RmdirRequest") - proto.RegisterType((*RmdirResponse)(nil), "v1alpha1.RmdirResponse") - proto.RegisterType((*LinkPathRequest)(nil), "v1alpha1.LinkPathRequest") - proto.RegisterType((*LinkPathResponse)(nil), "v1alpha1.LinkPathResponse") - proto.RegisterType((*IsMountPointRequest)(nil), "v1alpha1.IsMountPointRequest") - proto.RegisterType((*IsMountPointResponse)(nil), "v1alpha1.IsMountPointResponse") + proto.RegisterEnum("v1beta1.PathContext", PathContext_name, PathContext_value) + proto.RegisterType((*PathExistsRequest)(nil), "v1beta1.PathExistsRequest") + proto.RegisterType((*PathExistsResponse)(nil), "v1beta1.PathExistsResponse") + proto.RegisterType((*MkdirRequest)(nil), "v1beta1.MkdirRequest") + proto.RegisterType((*MkdirResponse)(nil), "v1beta1.MkdirResponse") + proto.RegisterType((*RmdirRequest)(nil), "v1beta1.RmdirRequest") + proto.RegisterType((*RmdirResponse)(nil), "v1beta1.RmdirResponse") + proto.RegisterType((*LinkPathRequest)(nil), "v1beta1.LinkPathRequest") + proto.RegisterType((*LinkPathResponse)(nil), "v1beta1.LinkPathResponse") + proto.RegisterType((*IsMountPointRequest)(nil), "v1beta1.IsMountPointRequest") + proto.RegisterType((*IsMountPointResponse)(nil), "v1beta1.IsMountPointResponse") } func init() { - proto.RegisterFile("github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.proto", fileDescriptor_78274760fcbff95c) -} - -var fileDescriptor_78274760fcbff95c = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x5f, 0x6f, 0xd3, 0x30, - 0x14, 0xc5, 0xdb, 0x8e, 0x75, 0xe5, 0xae, 0x8c, 0x72, 0x19, 0xa3, 0x84, 0x7f, 0x93, 0x05, 0x52, - 0x41, 0x5a, 0xa2, 0x8d, 0x37, 0x1e, 0x19, 0x7f, 0x54, 0xa9, 0x63, 0x51, 0x26, 0x24, 0xde, 0xaa, - 0x34, 0x78, 0x8b, 0xd5, 0x26, 0x0e, 0xb6, 0x83, 0xba, 0x0f, 0xcc, 0xf7, 0x40, 0x8e, 0x93, 0xc5, - 0x81, 0x92, 0xa7, 0xbd, 0xd5, 0xf7, 0xfe, 0x7c, 0xee, 0xa9, 0xef, 0x51, 0x60, 0x76, 0xc5, 0x54, - 0x9c, 0x2f, 0xdc, 0x88, 0x27, 0xde, 0x32, 0x5f, 0x50, 0x91, 0x52, 0x45, 0xe5, 0x51, 0x24, 0x99, - 0x17, 0x49, 0x76, 0x94, 0x09, 0xbe, 0xbe, 0xf6, 0xa2, 0x15, 0xa3, 0xa9, 0xf2, 0xc2, 0x8c, 0x79, - 0x97, 0x6c, 0x45, 0xe5, 0xb5, 0x54, 0x34, 0xf1, 0x7e, 0x1d, 0x87, 0xab, 0x2c, 0x0e, 0x8f, 0x75, - 0xdd, 0xcd, 0x04, 0x57, 0x1c, 0x07, 0x55, 0x8d, 0x7c, 0x87, 0x07, 0x7e, 0xa8, 0xe2, 0x4f, 0x6b, - 0x26, 0x95, 0x0c, 0xe8, 0xcf, 0x9c, 0x4a, 0x85, 0x08, 0x77, 0xb2, 0x50, 0xc5, 0xe3, 0xee, 0x61, - 0x77, 0x72, 0x37, 0x28, 0x7e, 0xa3, 0x07, 0x3b, 0x11, 0x4f, 0x15, 0x5d, 0xab, 0x71, 0xef, 0xb0, - 0x3b, 0xd9, 0x3b, 0x79, 0xe4, 0x56, 0x22, 0xae, 0x56, 0x38, 0x35, 0xcd, 0xa0, 0xa2, 0xc8, 0x07, - 0x40, 0x5b, 0x59, 0x66, 0x3c, 0x95, 0x14, 0xf7, 0x61, 0x9b, 0x0a, 0xc1, 0x45, 0xa9, 0x6d, 0x0e, - 0x78, 0x00, 0x7d, 0x5a, 0x70, 0x85, 0xf6, 0x20, 0x28, 0x4f, 0xe4, 0x02, 0x86, 0x67, 0xcb, 0x1f, - 0x4c, 0xdc, 0xaa, 0xb1, 0xd7, 0x70, 0xaf, 0x14, 0x6d, 0xf3, 0x44, 0x18, 0x0c, 0x83, 0xe4, 0x96, - 0x67, 0xeb, 0x51, 0x97, 0x5c, 0x44, 0x74, 0xbc, 0x55, 0xfc, 0x4f, 0x73, 0xd0, 0x8e, 0xca, 0x51, - 0xad, 0x8e, 0x2e, 0xe0, 0xfe, 0x8c, 0xa5, 0x4b, 0x2d, 0x5c, 0x99, 0x7a, 0x09, 0xbb, 0x92, 0xe7, - 0x22, 0xa2, 0x73, 0xcb, 0x1b, 0x98, 0x92, 0xe6, 0x34, 0xa0, 0x42, 0x71, 0x45, 0x95, 0x01, 0x7a, - 0x06, 0x30, 0x25, 0x0d, 0x90, 0x09, 0x8c, 0x6a, 0xd1, 0xd6, 0xf1, 0x6f, 0xe0, 0xe1, 0x54, 0x9e, - 0xf1, 0x3c, 0x55, 0x3e, 0x67, 0xa9, 0x6a, 0x79, 0x17, 0x12, 0xc0, 0x7e, 0x13, 0x6d, 0xdd, 0xfe, - 0x2b, 0xd8, 0x63, 0x72, 0x9e, 0x68, 0x7c, 0x9e, 0x69, 0xbe, 0x4c, 0xc1, 0x90, 0x59, 0x1a, 0x6f, - 0x09, 0xec, 0x5a, 0x4f, 0x8a, 0x00, 0x7d, 0x7f, 0xf6, 0xed, 0xcb, 0xf4, 0xeb, 0xa8, 0x83, 0x3b, - 0xb0, 0xe5, 0x9f, 0x7f, 0x1c, 0x75, 0x4f, 0x7e, 0xf7, 0x00, 0x3e, 0xdf, 0x24, 0x1f, 0xa7, 0x00, - 0x75, 0x04, 0xf1, 0x69, 0x73, 0x37, 0x8d, 0xc8, 0x3b, 0xcf, 0x36, 0x37, 0x8d, 0x6f, 0xd2, 0xc1, - 0xf7, 0xb0, 0x5d, 0x84, 0x06, 0x0f, 0x6a, 0xd0, 0x8e, 0xa6, 0xf3, 0xf8, 0x9f, 0xba, 0x7d, 0xb7, - 0x58, 0xaf, 0x7d, 0xd7, 0x8e, 0x96, 0x7d, 0xb7, 0x91, 0x03, 0xd2, 0xc1, 0x53, 0x18, 0x54, 0xeb, - 0xc1, 0x27, 0x35, 0xf6, 0x57, 0x0e, 0x1c, 0x67, 0x53, 0xeb, 0x46, 0xe4, 0x1c, 0x86, 0xf6, 0x3a, - 0xf0, 0x79, 0x4d, 0x6f, 0xd8, 0xa8, 0xf3, 0xe2, 0x7f, 0xed, 0x4a, 0x70, 0xd1, 0x2f, 0x3e, 0x23, - 0xef, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x34, 0xc0, 0xa2, 0x65, 0x96, 0x04, 0x00, 0x00, + proto.RegisterFile("github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.proto", fileDescriptor_b03a6091226f91c2) +} + +var fileDescriptor_b03a6091226f91c2 = []byte{ + // 461 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x6f, 0xd3, 0x40, + 0x10, 0xc5, 0x93, 0x94, 0x26, 0x65, 0x1a, 0x4a, 0x18, 0x42, 0x15, 0x0c, 0x88, 0x6a, 0x05, 0x52, + 0x40, 0xaa, 0xad, 0x96, 0x0b, 0x57, 0xfe, 0x56, 0x15, 0x0d, 0x44, 0x46, 0x88, 0x63, 0xe4, 0x98, + 0x69, 0xb3, 0x4a, 0xe3, 0x35, 0xbb, 0x63, 0x94, 0x7e, 0x56, 0xbe, 0x0c, 0x5a, 0xdb, 0x71, 0x37, + 0x55, 0xf0, 0xa9, 0xb7, 0xec, 0xcc, 0x6f, 0xdf, 0xbc, 0xec, 0x3c, 0x19, 0xbe, 0x5c, 0x48, 0x9e, + 0x65, 0x53, 0x3f, 0x56, 0x8b, 0x60, 0x9e, 0x4d, 0x49, 0x27, 0xc4, 0x64, 0x0e, 0x63, 0x23, 0x83, + 0xd8, 0xc8, 0xc3, 0x54, 0xab, 0xe5, 0x55, 0x10, 0x5f, 0x4a, 0x4a, 0x38, 0x88, 0x52, 0x19, 0x9c, + 0xcb, 0x4b, 0x32, 0x57, 0x86, 0x69, 0x11, 0xfc, 0x39, 0x9a, 0x12, 0x47, 0x47, 0xb6, 0xec, 0xa7, + 0x5a, 0xb1, 0xc2, 0x4e, 0x59, 0x12, 0x3f, 0xe1, 0xc1, 0x38, 0xe2, 0xd9, 0xa7, 0xa5, 0x34, 0x6c, + 0x42, 0xfa, 0x9d, 0x91, 0x61, 0x44, 0xb8, 0x93, 0x46, 0x3c, 0x1b, 0x34, 0x0f, 0x9a, 0xc3, 0xbb, + 0x61, 0xfe, 0x1b, 0x7d, 0xe8, 0xc4, 0x2a, 0x61, 0x5a, 0xf2, 0xa0, 0x75, 0xd0, 0x1c, 0xee, 0x1d, + 0xf7, 0xfd, 0x52, 0xc3, 0xb7, 0x02, 0x1f, 0x8a, 0x5e, 0xb8, 0x82, 0xc4, 0x7b, 0x40, 0x57, 0xd8, + 0xa4, 0x2a, 0x31, 0x84, 0x7d, 0xd8, 0x26, 0xad, 0x95, 0x2e, 0xa5, 0x8b, 0x03, 0xee, 0x43, 0x9b, + 0x72, 0x2e, 0x97, 0xde, 0x09, 0xcb, 0x93, 0x08, 0xa1, 0x3b, 0x9a, 0xff, 0x92, 0xfa, 0x36, 0x7d, + 0xbd, 0x84, 0x7b, 0xa5, 0x66, 0x9d, 0x25, 0x31, 0x83, 0x6e, 0xb8, 0xb8, 0xdd, 0xd1, 0x76, 0xd2, + 0xb9, 0xd2, 0x31, 0x0d, 0xb6, 0xf2, 0x7f, 0x59, 0x1c, 0xac, 0xa1, 0x72, 0x52, 0xad, 0xa1, 0xef, + 0x70, 0xff, 0x4c, 0x26, 0x73, 0x2b, 0xbc, 0xf2, 0xf4, 0x1c, 0x76, 0x8d, 0xca, 0x74, 0x4c, 0x13, + 0xc7, 0x1a, 0x14, 0x25, 0xcb, 0x59, 0x80, 0x23, 0x7d, 0x41, 0x5c, 0x00, 0xad, 0x02, 0x28, 0x4a, + 0x16, 0x10, 0x43, 0xe8, 0x5d, 0x8b, 0xd6, 0x8e, 0x7f, 0x05, 0x0f, 0x4f, 0xcd, 0x48, 0x65, 0x09, + 0x8f, 0x95, 0x4c, 0xb8, 0xe6, 0x59, 0x44, 0x08, 0xfd, 0x75, 0xb4, 0x76, 0xf7, 0x2f, 0x60, 0x4f, + 0x9a, 0xc9, 0xc2, 0xe2, 0x93, 0xd4, 0xf2, 0x65, 0x06, 0xba, 0xd2, 0xd1, 0x78, 0x2d, 0x60, 0xd7, + 0x79, 0x52, 0x04, 0x68, 0x8f, 0xcf, 0x7e, 0x9c, 0x9c, 0x7e, 0xed, 0x35, 0xb0, 0x03, 0x5b, 0xe3, + 0x6f, 0x1f, 0x7b, 0xcd, 0xe3, 0xbf, 0x2d, 0x80, 0xcf, 0x55, 0xe8, 0xf1, 0x04, 0xe0, 0x3a, 0x80, + 0xe8, 0xad, 0xad, 0x66, 0x2d, 0xee, 0xde, 0x93, 0x8d, 0xbd, 0xc2, 0xb5, 0x68, 0xe0, 0x5b, 0xd8, + 0xce, 0x13, 0x83, 0x8f, 0x2a, 0xce, 0x4d, 0xa5, 0xb7, 0x7f, 0xb3, 0xec, 0xde, 0xcc, 0x57, 0xeb, + 0xdc, 0x74, 0x43, 0xe5, 0xdc, 0x5c, 0x4b, 0x80, 0x68, 0xe0, 0x3b, 0xd8, 0x59, 0x2d, 0x06, 0x07, + 0x15, 0x75, 0x23, 0x00, 0xde, 0xe3, 0x0d, 0x9d, 0x4a, 0x62, 0x04, 0x5d, 0x77, 0x0d, 0xf8, 0xb4, + 0x82, 0x37, 0x2c, 0xd2, 0x7b, 0xf6, 0x9f, 0xee, 0x4a, 0x6e, 0xda, 0xce, 0x3f, 0x1c, 0x6f, 0xfe, + 0x05, 0x00, 0x00, 0xff, 0xff, 0x54, 0x94, 0x73, 0xfe, 0x87, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConnInterface +var _ grpc.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion6 +const _ = grpc.SupportPackageIsVersion4 // FilesystemClient is the client API for Filesystem service. // @@ -660,16 +660,16 @@ type FilesystemClient interface { } type filesystemClient struct { - cc grpc.ClientConnInterface + cc *grpc.ClientConn } -func NewFilesystemClient(cc grpc.ClientConnInterface) FilesystemClient { +func NewFilesystemClient(cc *grpc.ClientConn) FilesystemClient { return &filesystemClient{cc} } func (c *filesystemClient) PathExists(ctx context.Context, in *PathExistsRequest, opts ...grpc.CallOption) (*PathExistsResponse, error) { out := new(PathExistsResponse) - err := c.cc.Invoke(ctx, "/v1alpha1.Filesystem/PathExists", in, out, opts...) + err := c.cc.Invoke(ctx, "/v1beta1.Filesystem/PathExists", in, out, opts...) if err != nil { return nil, err } @@ -678,7 +678,7 @@ func (c *filesystemClient) PathExists(ctx context.Context, in *PathExistsRequest func (c *filesystemClient) Mkdir(ctx context.Context, in *MkdirRequest, opts ...grpc.CallOption) (*MkdirResponse, error) { out := new(MkdirResponse) - err := c.cc.Invoke(ctx, "/v1alpha1.Filesystem/Mkdir", in, out, opts...) + err := c.cc.Invoke(ctx, "/v1beta1.Filesystem/Mkdir", in, out, opts...) if err != nil { return nil, err } @@ -687,7 +687,7 @@ func (c *filesystemClient) Mkdir(ctx context.Context, in *MkdirRequest, opts ... func (c *filesystemClient) Rmdir(ctx context.Context, in *RmdirRequest, opts ...grpc.CallOption) (*RmdirResponse, error) { out := new(RmdirResponse) - err := c.cc.Invoke(ctx, "/v1alpha1.Filesystem/Rmdir", in, out, opts...) + err := c.cc.Invoke(ctx, "/v1beta1.Filesystem/Rmdir", in, out, opts...) if err != nil { return nil, err } @@ -696,7 +696,7 @@ func (c *filesystemClient) Rmdir(ctx context.Context, in *RmdirRequest, opts ... func (c *filesystemClient) LinkPath(ctx context.Context, in *LinkPathRequest, opts ...grpc.CallOption) (*LinkPathResponse, error) { out := new(LinkPathResponse) - err := c.cc.Invoke(ctx, "/v1alpha1.Filesystem/LinkPath", in, out, opts...) + err := c.cc.Invoke(ctx, "/v1beta1.Filesystem/LinkPath", in, out, opts...) if err != nil { return nil, err } @@ -705,7 +705,7 @@ func (c *filesystemClient) LinkPath(ctx context.Context, in *LinkPathRequest, op func (c *filesystemClient) IsMountPoint(ctx context.Context, in *IsMountPointRequest, opts ...grpc.CallOption) (*IsMountPointResponse, error) { out := new(IsMountPointResponse) - err := c.cc.Invoke(ctx, "/v1alpha1.Filesystem/IsMountPoint", in, out, opts...) + err := c.cc.Invoke(ctx, "/v1beta1.Filesystem/IsMountPoint", in, out, opts...) if err != nil { return nil, err } @@ -762,7 +762,7 @@ func _Filesystem_PathExists_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/v1alpha1.Filesystem/PathExists", + FullMethod: "/v1beta1.Filesystem/PathExists", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FilesystemServer).PathExists(ctx, req.(*PathExistsRequest)) @@ -780,7 +780,7 @@ func _Filesystem_Mkdir_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/v1alpha1.Filesystem/Mkdir", + FullMethod: "/v1beta1.Filesystem/Mkdir", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FilesystemServer).Mkdir(ctx, req.(*MkdirRequest)) @@ -798,7 +798,7 @@ func _Filesystem_Rmdir_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/v1alpha1.Filesystem/Rmdir", + FullMethod: "/v1beta1.Filesystem/Rmdir", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FilesystemServer).Rmdir(ctx, req.(*RmdirRequest)) @@ -816,7 +816,7 @@ func _Filesystem_LinkPath_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/v1alpha1.Filesystem/LinkPath", + FullMethod: "/v1beta1.Filesystem/LinkPath", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FilesystemServer).LinkPath(ctx, req.(*LinkPathRequest)) @@ -834,7 +834,7 @@ func _Filesystem_IsMountPoint_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/v1alpha1.Filesystem/IsMountPoint", + FullMethod: "/v1beta1.Filesystem/IsMountPoint", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(FilesystemServer).IsMountPoint(ctx, req.(*IsMountPointRequest)) @@ -843,7 +843,7 @@ func _Filesystem_IsMountPoint_Handler(srv interface{}, ctx context.Context, dec } var _Filesystem_serviceDesc = grpc.ServiceDesc{ - ServiceName: "v1alpha1.Filesystem", + ServiceName: "v1beta1.Filesystem", HandlerType: (*FilesystemServer)(nil), Methods: []grpc.MethodDesc{ { @@ -868,5 +868,5 @@ var _Filesystem_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.proto", + Metadata: "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.proto", } diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.proto b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.proto similarity index 99% rename from vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.proto rename to vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.proto index 8856da5c4..3b4c0ab2f 100644 --- a/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.proto +++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package v1alpha1; +package v1beta1; service Filesystem { // PathExists checks if the requested path exists in the host's filesystem diff --git a/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1/client_generated.go b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1/client_generated.go similarity index 61% rename from vendor/github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1/client_generated.go rename to vendor/github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1/client_generated.go index b6f23557d..a68e86fa9 100644 --- a/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1/client_generated.go +++ b/vendor/github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1/client_generated.go @@ -1,6 +1,6 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. -package v1alpha1 +package v1beta1 import ( "context" @@ -8,21 +8,21 @@ import ( "github.com/Microsoft/go-winio" "github.com/kubernetes-csi/csi-proxy/client" - "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" "google.golang.org/grpc" ) const groupName = "filesystem" -var version = apiversion.NewVersionOrPanic("v1alpha1") +var version = apiversion.NewVersionOrPanic("v1beta1") type Client struct { - client v1alpha1.FilesystemClient + client v1beta1.FilesystemClient connection *grpc.ClientConn } -// NewClient returns a client to make calls to the filesystem API group version v1alpha1. +// NewClient returns a client to make calls to the filesystem API group version v1beta1. // It's the caller's responsibility to Close the client when done. func NewClient() (*Client, error) { pipePath := client.PipePath(groupName, version) @@ -36,7 +36,7 @@ func NewClient() (*Client, error) { return nil, err } - client := v1alpha1.NewFilesystemClient(connection) + client := v1beta1.NewFilesystemClient(connection) return &Client{ client: client, connection: connection, @@ -49,24 +49,24 @@ func (w *Client) Close() error { } // ensures we implement all the required methods -var _ v1alpha1.FilesystemClient = &Client{} +var _ v1beta1.FilesystemClient = &Client{} -func (w *Client) IsMountPoint(context context.Context, request *v1alpha1.IsMountPointRequest, opts ...grpc.CallOption) (*v1alpha1.IsMountPointResponse, error) { +func (w *Client) IsMountPoint(context context.Context, request *v1beta1.IsMountPointRequest, opts ...grpc.CallOption) (*v1beta1.IsMountPointResponse, error) { return w.client.IsMountPoint(context, request, opts...) } -func (w *Client) LinkPath(context context.Context, request *v1alpha1.LinkPathRequest, opts ...grpc.CallOption) (*v1alpha1.LinkPathResponse, error) { +func (w *Client) LinkPath(context context.Context, request *v1beta1.LinkPathRequest, opts ...grpc.CallOption) (*v1beta1.LinkPathResponse, error) { return w.client.LinkPath(context, request, opts...) } -func (w *Client) Mkdir(context context.Context, request *v1alpha1.MkdirRequest, opts ...grpc.CallOption) (*v1alpha1.MkdirResponse, error) { +func (w *Client) Mkdir(context context.Context, request *v1beta1.MkdirRequest, opts ...grpc.CallOption) (*v1beta1.MkdirResponse, error) { return w.client.Mkdir(context, request, opts...) } -func (w *Client) PathExists(context context.Context, request *v1alpha1.PathExistsRequest, opts ...grpc.CallOption) (*v1alpha1.PathExistsResponse, error) { +func (w *Client) PathExists(context context.Context, request *v1beta1.PathExistsRequest, opts ...grpc.CallOption) (*v1beta1.PathExistsResponse, error) { return w.client.PathExists(context, request, opts...) } -func (w *Client) Rmdir(context context.Context, request *v1alpha1.RmdirRequest, opts ...grpc.CallOption) (*v1alpha1.RmdirResponse, error) { +func (w *Client) Rmdir(context context.Context, request *v1beta1.RmdirRequest, opts ...grpc.CallOption) (*v1beta1.RmdirResponse, error) { return w.client.Rmdir(context, request, opts...) } diff --git a/vendor/modules.txt b/vendor/modules.txt index e50b36954..7feaab57d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -56,14 +56,14 @@ github.com/imdario/mergo github.com/json-iterator/go # github.com/konsorten/go-windows-terminal-sequences v1.0.2 github.com/konsorten/go-windows-terminal-sequences -# github.com/kubernetes-csi/csi-proxy/client v0.2.0 +# github.com/kubernetes-csi/csi-proxy/client v0.2.1 github.com/kubernetes-csi/csi-proxy/client github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1 -github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1 +github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1 github.com/kubernetes-csi/csi-proxy/client/apiversion github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1 -github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1 +github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1 github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1 # github.com/kubernetes-csi/csi-test/v3 v3.0.0 github.com/kubernetes-csi/csi-test/v3/pkg/sanity