Skip to content
This repository was archived by the owner on Apr 24, 2024. It is now read-only.

Commit ca57c96

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #30 from krishchow/update-api
updates api version, manifest fields
2 parents bbe65bf + 12ee5a0 commit ca57c96

File tree

10 files changed

+38
-20
lines changed

10 files changed

+38
-20
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ require (
1515
k8s.io/client-go v0.20.0
1616
k8s.io/klog/v2 v2.6.0
1717
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
18-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9
18+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210330175159-2cdabb1a5dc7
1919
)

‎go.sum‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
102102
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
103103
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
104104
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
105+
github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA=
105106
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
106107
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
107108
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -546,6 +547,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
546547
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
547548
golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
548549
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
550+
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
549551
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
550552
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
551553
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -719,6 +721,7 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
719721
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
720722
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
721723
google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
724+
google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
722725
google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As=
723726
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
724727
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -817,8 +820,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
817820
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
818821
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
819822
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
820-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9 h1:ZjGviVPvDVxOhCF7+dsbAk5GPfUpEnM0DtR5yH7S6ww=
821-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210225042325-7c26b4fc1ed9/go.mod h1:4V9ty4CWneFEQJbr+yQPjkCdUH3EKfjXM4AQXLY4Sa8=
823+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210330175159-2cdabb1a5dc7 h1:M2ZMhWdq9Az8TFj8G6ZffFUpR4XG7Qy8h8ZGsZhi9Xg=
824+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210330175159-2cdabb1a5dc7/go.mod h1:5n4lNKN4uOMW2NTqJ9r8qRAiqh5dZRZB7CNOkFihLfM=
825+
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19 h1:LrLrBCBqO7O/VjJtTrDSj3/f7hLSQaCIouLZFnHGxFg=
826+
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19/go.mod h1:kafkL5l/lTUrZXhVi/9p1GzpEE/ts29BkWkL3Ao33WU=
822827
sigs.k8s.io/controller-runtime v0.6.3 h1:SBbr+inLPEKhvlJtrvDcwIpm+uhDvp63Bl72xYJtoOE=
823828
sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
824829
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=

‎pkg/node/client.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (n *NodeClient) getBAR(ctx context.Context, barName, barNs string) (*v1alph
6969
if len(bar.Spec.BucketRequestName) == 0 {
7070
return nil, fmt.Errorf("bucketAccessRequest.Spec.BucketRequestName unset")
7171
}
72-
if len(bar.Spec.BucketAccessName) == 0 {
72+
if len(bar.Status.BucketAccessName) == 0 {
7373
return nil, fmt.Errorf("bucketAccessRequest.Spec.BucketAccessName unset")
7474
}
7575
return bar, nil
@@ -105,7 +105,7 @@ func (n *NodeClient) getBR(ctx context.Context, brName, brNs string) (*v1alpha1.
105105
if !br.Status.BucketAvailable {
106106
return nil, logErr(fmt.Errorf("bucketRequest is not available yet %q", fmt.Sprintf("%s/%s", brNs, brName)))
107107
}
108-
if len(br.Spec.BucketInstanceName) == 0 {
108+
if len(br.Status.BucketName) == 0 {
109109
return nil, logErr(fmt.Errorf("bucketRequest.Spec.BucketInstanceName unset"))
110110
}
111111
return br, nil
@@ -138,15 +138,15 @@ func (n *NodeClient) GetResources(ctx context.Context, barName, barNs string) (b
138138
return
139139
}
140140

141-
if ba, err = n.getBA(ctx, bar.Spec.BucketAccessName); err != nil {
141+
if ba, err = n.getBA(ctx, bar.Status.BucketAccessName); err != nil {
142142
return
143143
}
144144

145145
if br, err = n.getBR(ctx, bar.Spec.BucketRequestName, barNs); err != nil {
146146
return
147147
}
148148

149-
if bkt, err = n.getB(ctx, br.Spec.BucketInstanceName); err != nil {
149+
if bkt, err = n.getB(ctx, br.Status.BucketName); err != nil {
150150
return
151151
}
152152

@@ -160,15 +160,15 @@ func (n *NodeClient) GetResources(ctx context.Context, barName, barNs string) (b
160160
func (n *NodeClient) getProtocol(bkt *v1alpha1.Bucket) (data []byte, err error) {
161161
klog.Infof("bucket protocol %+v", bkt.Spec.Protocol)
162162
var protocolConnection interface{}
163-
switch bkt.Spec.Protocol.Name {
164-
case v1alpha1.ProtocolNameS3:
163+
switch {
164+
case bkt.Spec.Protocol.S3 != nil:
165165
protocolConnection = bkt.Spec.Protocol.S3
166-
case v1alpha1.ProtocolNameAzure:
166+
case bkt.Spec.Protocol.AzureBlob != nil:
167167
protocolConnection = bkt.Spec.Protocol.AzureBlob
168-
case v1alpha1.ProtocolNameGCS:
168+
case bkt.Spec.Protocol.GCS != nil:
169169
protocolConnection = bkt.Spec.Protocol.GCS
170170
default:
171-
err = fmt.Errorf("unrecognized protocol %q, unable to extract connection data", bkt.Spec.Protocol.Name)
171+
err = fmt.Errorf("unrecognized protocol %+v, unable to extract connection data", bkt.Spec.Protocol)
172172
}
173173
if err != nil {
174174
return nil, logErr(err)

‎pkg/node/node.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (n *NodeServer) NodePublishVolume(ctx context.Context, request *csi.NodePub
7070
return nil, status.Error(codes.Internal, err.Error())
7171
}
7272

73-
klog.Infof("bucket %q has protocol %q", bkt.Name, bkt.Spec.Protocol.Name)
73+
klog.Infof("bucket %q has protocol %q", bkt.Name, bkt.Spec.Protocol)
7474

7575
if err := n.provisioner.createDir(request.GetVolumeId()); err != nil {
7676
return nil, status.Error(codes.Internal, err.Error())

‎sample/bucketaccessclass.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ kind: BucketAccessClass
66
apiVersion: objectstorage.k8s.io/v1alpha1
77
metadata:
88
name: sample-bac
9-
provisioner: sample
9+
policyActionsConfigMap:
10+
name: sample-cm
11+
namespace: default

‎sample/bucketaccessrequest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
name: sample-bar
1010
spec:
1111
bucketAccessClassName: sample-bac
12-
bucketAccessName: sample-ba
1312
bucketRequestName: sample-br
13+
serviceAccountName: sample-sa
1414
status:
1515
accessGranted: true

‎sample/bucketclass.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ kind: BucketClass
66
apiVersion: objectstorage.k8s.io/v1alpha1
77
metadata:
88
name: sample-bc
9+
provisioner: minio.objectstorage.k8s.io
10+
isDefaultBucketClass: true
11+
allowedNamespaces:
12+
- default
913
protocol:
10-
name: s3
1114
s3:
1215
bucketName: sampleBucket
1316
endpoint: sampleBucket.com
1417
region: us-east-1
15-
signatureVersion: s3v4
16-
version: v1alpha1
17-
provisioner: sample
18+
signatureVersion: S3V4
19+
deletionPolicy: Delete

‎sample/bucketrequest.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ metadata:
88
name: sample-br
99
spec:
1010
bucketClassName: sample-bc
11-
bucketInstanceName: sample-b
1211
bucketPrefix: test
1312
status:
1413
bucketAvailable: true

‎sample/configmap.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: sample-cm
5+
data:
6+
provisioner_data: "test_data"

‎sample/sa.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: sample-sa

0 commit comments

Comments
 (0)