Skip to content

Commit 106b17a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-retired#49 from krishchow/demo-prep
move to sigs.k8s.io, remove retry logic in cosi-controller
2 parents 32eb08b + d0aa4c8 commit 106b17a

File tree

7 files changed

+25
-38
lines changed

7 files changed

+25
-38
lines changed

Diff for: ‎container-object-storage-interface-controller/cmd/controller-manager/controller-manager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/spf13/cobra"
1111
"github.com/spf13/viper"
1212

13-
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/bucketaccessrequest"
14-
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/bucketrequest"
1513
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
14+
"sigs.k8s.io/container-object-storage-interface-controller/pkg/bucketaccessrequest"
15+
"sigs.k8s.io/container-object-storage-interface-controller/pkg/bucketrequest"
1616

1717
"k8s.io/klog/v2"
1818
)

Diff for: ‎container-object-storage-interface-controller/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/kubernetes-sigs/container-object-storage-interface-controller
1+
module sigs.k8s.io/container-object-storage-interface-controller
22

33
go 1.15
44

@@ -28,6 +28,6 @@ require (
2828
k8s.io/client-go v0.19.4
2929
k8s.io/klog/v2 v2.4.0
3030
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
31-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210330175159-2cdabb1a5dc7
31+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210416205422-83cd0d53ce7f
3232
sigs.k8s.io/controller-tools v0.4.1
3333
)

Diff for: ‎container-object-storage-interface-controller/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,8 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
783783
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
784784
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
785785
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0=
786-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210330175159-2cdabb1a5dc7 h1:M2ZMhWdq9Az8TFj8G6ZffFUpR4XG7Qy8h8ZGsZhi9Xg=
787-
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210330175159-2cdabb1a5dc7/go.mod h1:5n4lNKN4uOMW2NTqJ9r8qRAiqh5dZRZB7CNOkFihLfM=
786+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210416205422-83cd0d53ce7f h1:LtkVxN0N+qKHLuYE/N5qxSkJv/3bWkr3+9ZBVwiq1tw=
787+
sigs.k8s.io/container-object-storage-interface-api v0.0.0-20210416205422-83cd0d53ce7f/go.mod h1:WTzZGS4Q6MdQqDihJdMh2kCvqMx9Amhx0KIainA4lXQ=
788788
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19 h1:LrLrBCBqO7O/VjJtTrDSj3/f7hLSQaCIouLZFnHGxFg=
789789
sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19/go.mod h1:kafkL5l/lTUrZXhVi/9p1GzpEE/ts29BkWkL3Ao33WU=
790790
sigs.k8s.io/controller-runtime v0.6.3 h1:SBbr+inLPEKhvlJtrvDcwIpm+uhDvp63Bl72xYJtoOE=

Diff for: ‎container-object-storage-interface-controller/pkg/bucketaccessrequest/bucketaccessrequest.go

+5-12
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import (
77
"k8s.io/apimachinery/pkg/api/errors"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99
kubeclientset "k8s.io/client-go/kubernetes"
10-
"k8s.io/client-go/util/retry"
10+
"k8s.io/klog/v2"
1111

12-
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
1312
"sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
1413
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset"
1514
bucketcontroller "sigs.k8s.io/container-object-storage-interface-api/controller"
1615

17-
"k8s.io/klog/v2"
16+
"sigs.k8s.io/container-object-storage-interface-controller/pkg/util"
1817
)
1918

2019
type bucketAccessRequestListener struct {
@@ -144,15 +143,9 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
144143
return err
145144
}
146145

147-
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
148-
bucketAccessRequest.Status.BucketAccessName = bucketaccess.Name
149-
bucketAccessRequest.Status.AccessGranted = true
150-
_, err := barClient(bucketAccessRequest.Namespace).UpdateStatus(ctx, bucketAccessRequest, metav1.UpdateOptions{})
151-
if err != nil {
152-
return err
153-
}
154-
return nil
155-
})
146+
bucketAccessRequest.Status.BucketAccessName = bucketaccess.Name
147+
bucketAccessRequest.Status.AccessGranted = true
148+
_, err = barClient(bucketAccessRequest.Namespace).UpdateStatus(ctx, bucketAccessRequest, metav1.UpdateOptions{})
156149
if err != nil {
157150
return err
158151
}

Diff for: ‎container-object-storage-interface-controller/pkg/bucketaccessrequest/bucketaccessrequest_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66

77
v1 "k8s.io/api/core/v1"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9-
109
"k8s.io/client-go/kubernetes/fake"
11-
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset/fake"
1210

13-
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
1411
types "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
12+
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset/fake"
13+
14+
"sigs.k8s.io/container-object-storage-interface-controller/pkg/util"
1515
)
1616

1717
var sa1 = v1.ServiceAccount{

Diff for: ‎container-object-storage-interface-controller/pkg/bucketrequest/bucketrequest.go

+8-14
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ import (
66
v1 "k8s.io/api/core/v1"
77
"k8s.io/apimachinery/pkg/api/errors"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
9-
"k8s.io/client-go/util/retry"
10-
11-
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
129
kubeclientset "k8s.io/client-go/kubernetes"
10+
"k8s.io/klog/v2"
11+
1312
"sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
1413
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset"
1514
objectstoragev1alpha1 "sigs.k8s.io/container-object-storage-interface-api/clientset/typed/objectstorage.k8s.io/v1alpha1"
1615

17-
"k8s.io/klog/v2"
16+
"sigs.k8s.io/container-object-storage-interface-controller/pkg/util"
1817
)
1918

2019
// bucketRequestListener is a resource handler for bucket requests objects
@@ -109,7 +108,7 @@ func (b *bucketRequestListener) provisionBucketRequestOperation(ctx context.Cont
109108
bucket := &v1alpha1.Bucket{}
110109

111110
bucket.Name = name
112-
bucket.Spec.BucketID = name
111+
bucket.Status.BucketID = name
113112
bucket.Spec.Provisioner = bucketClass.Provisioner
114113
bucket.Spec.BucketClassName = bucketClass.Name
115114
bucket.Spec.DeletionPolicy = bucketClass.DeletionPolicy
@@ -128,18 +127,13 @@ func (b *bucketRequestListener) provisionBucketRequestOperation(ctx context.Cont
128127
return err
129128
}
130129

131-
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
132-
bucketRequest.Status.BucketName = bucket.Name
133-
bucketRequest.Status.BucketAvailable = true
134-
_, err := b.BucketRequests(bucketRequest.Namespace).UpdateStatus(ctx, bucketRequest, metav1.UpdateOptions{})
135-
if err != nil {
136-
return err
137-
}
138-
return nil
139-
})
130+
bucketRequest.Status.BucketName = bucket.Name
131+
bucketRequest.Status.BucketAvailable = true
132+
_, err = b.BucketRequests(bucketRequest.Namespace).UpdateStatus(ctx, bucketRequest, metav1.UpdateOptions{})
140133
if err != nil {
141134
return err
142135
}
136+
143137
klog.Infof("Finished creating Bucket %v", bucket.Name)
144138
return nil
145139
}

Diff for: ‎container-object-storage-interface-controller/pkg/bucketrequest/bucketrequest_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import (
55
"testing"
66

77
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8-
98
"k8s.io/client-go/kubernetes/fake"
10-
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset/fake"
119

12-
"github.com/kubernetes-sigs/container-object-storage-interface-controller/pkg/util"
1310
types "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage.k8s.io/v1alpha1"
11+
bucketclientset "sigs.k8s.io/container-object-storage-interface-api/clientset/fake"
12+
13+
"sigs.k8s.io/container-object-storage-interface-controller/pkg/util"
1414
)
1515

1616
var classGoldParameters = map[string]string{

0 commit comments

Comments
 (0)