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

Commit 621cf91

Browse files
committed
chore: update API
Signed-off-by: Mateusz Urbanek <[email protected]>
1 parent 2cceac4 commit 621cf91

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

Diff for: go.mod

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ module sigs.k8s.io/container-object-storage-interface-provisioner-sidecar
22

33
go 1.18
44

5-
replace sigs.k8s.io/container-object-storage-interface-api => github.com/shanduur/container-object-storage-interface-api v0.0.0-20231018134926-df1d34a6d9e9
6-
75
require (
86
github.com/pkg/errors v0.9.1
97
github.com/spf13/cobra v1.4.0
@@ -14,10 +12,9 @@ require (
1412
k8s.io/apimachinery v0.24.2
1513
k8s.io/client-go v0.24.2
1614
k8s.io/klog/v2 v2.70.1
17-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20220806044417-5d7517114883
15+
sigs.k8s.io/container-object-storage-interface-api v0.1.1-0.20231116171305-97700454b010
1816
sigs.k8s.io/container-object-storage-interface-spec v0.1.1-0.20221006174327-ec782953b8ac
1917
sigs.k8s.io/controller-runtime v0.12.3
20-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1
2118
)
2219

2320
require (
@@ -70,5 +67,6 @@ require (
7067
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
7168
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
7269
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
70+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
7371
sigs.k8s.io/yaml v1.3.0 // indirect
7472
)

Diff for: go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,6 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
282282
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
283283
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
284284
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
285-
github.com/shanduur/container-object-storage-interface-api v0.0.0-20231018134926-df1d34a6d9e9 h1:ASp7U0yEVMR1/OOUI/KbwgWNh43oSoV90jkpyx2PykY=
286-
github.com/shanduur/container-object-storage-interface-api v0.0.0-20231018134926-df1d34a6d9e9/go.mod h1:YiB+i/UGkzqgODDhRG3u7jkbWkQcoUeLEJ7hwOT/2Qk=
287285
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
288286
github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
289287
github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
@@ -727,6 +725,8 @@ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
727725
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
728726
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
729727
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
728+
sigs.k8s.io/container-object-storage-interface-api v0.1.1-0.20231116171305-97700454b010 h1:8Lw3AyLbbkRGlB9GRu9prtSPEp8DLlXjUzaXN6b9gxM=
729+
sigs.k8s.io/container-object-storage-interface-api v0.1.1-0.20231116171305-97700454b010/go.mod h1:YiB+i/UGkzqgODDhRG3u7jkbWkQcoUeLEJ7hwOT/2Qk=
730730
sigs.k8s.io/container-object-storage-interface-spec v0.1.1-0.20221006174327-ec782953b8ac h1:M1ZBBDJVWw3gDmE+kZZmwQ6+29GbWhG9RMqx9oV0tEs=
731731
sigs.k8s.io/container-object-storage-interface-spec v0.1.1-0.20221006174327-ec782953b8ac/go.mod h1:SzF/yVSh88TgYdBOAXqhT96XjU8pCQtoeQKxzIOOmWQ=
732732
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=

Diff for: pkg/bucket/bucket_controller.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"sigs.k8s.io/container-object-storage-interface-provisioner-sidecar/pkg/consts"
3636
cosi "sigs.k8s.io/container-object-storage-interface-spec"
3737
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
38-
"sigs.k8s.io/structured-merge-diff/v4/schema"
3938

4039
"github.com/pkg/errors"
4140
"google.golang.org/grpc/codes"
@@ -232,6 +231,11 @@ func (b *BucketListener) Update(ctx context.Context, old, new *v1alpha1.Bucket)
232231
bucketClaimNs := bucket.Spec.BucketClaim.Namespace
233232
bucketClaimName := bucket.Spec.BucketClaim.Name
234233
bucketAccessList, err := b.bucketAccesses(bucketClaimNs).List(ctx, metav1.ListOptions{})
234+
if err != nil {
235+
klog.V(3).ErrorS(err, "Error fetching BucketAccessList",
236+
"bucket", bucket.ObjectMeta.Name)
237+
return err
238+
}
235239

236240
for _, bucketAccess := range bucketAccessList.Items {
237241
if strings.EqualFold(bucketAccess.Spec.BucketClaimName, bucketClaimName) {
@@ -419,8 +423,6 @@ func (b *BucketListener) bucketAccesses(namespace string) bucketapi.BucketAccess
419423

420424
// recordEvent during the processing of the objects
421425
func (b *BucketListener) recordEvent(subject runtime.Object, eventtype, reason, message string) {
422-
klog.InfoS("schema", "schema", schema.Schema)
423-
424426
if b.eventRecorder == nil {
425427
return
426428
}

Diff for: pkg/provisioner/provisioner.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ package provisioner
1717

1818
import (
1919
"context"
20-
"google.golang.org/grpc/backoff"
2120
"net/url"
2221
"time"
2322

2423
"github.com/pkg/errors"
2524
"google.golang.org/grpc"
25+
"google.golang.org/grpc/backoff"
26+
"google.golang.org/grpc/credentials/insecure"
2627

2728
"k8s.io/klog/v2"
2829
cosi "sigs.k8s.io/container-object-storage-interface-spec"
@@ -38,7 +39,7 @@ func NewDefaultCOSIProvisionerClient(ctx context.Context, address string, debug
3839
backoffConfiguration.MaxDelay = maxGrpcBackoff
3940

4041
dialOpts := []grpc.DialOption{
41-
grpc.WithInsecure(), // strictly restricting to local Unix domain socket
42+
grpc.WithTransportCredentials(insecure.NewCredentials()), // strictly restricting to local Unix domain socket
4243
grpc.WithConnectParams(grpc.ConnectParams{
4344
Backoff: backoffConfiguration,
4445
MinConnectTimeout: grpcDialTimeout,

0 commit comments

Comments
 (0)