Bump Controller Runtime version to 0.6 #6568

aruniiird · 2020-11-06T13:34:32Z

Signed-off-by: Arun Kumar Mohan amohan@redhat.com

Description of your changes:

Which issue is resolved by this Pull Request:
Resolves #

Checklist:

aruniiird · 2020-11-06T13:37:14Z

@umangachapagain , I have updated the dependencies' versions to v0.19.3 . Please take a look...

travisn · 2020-11-06T14:50:20Z

@aruniiird Some more code updates are needed, see the errors in the CI.

aruniiird · 2020-11-10T21:27:14Z

Addressed all other issues, but now I have hit the following lib-bucket-provisioner error

/home/arun/go/pkg/mod/github.com/kube-object-storage/lib-bucket-provisioner@v0.0.0-20200610144127-e2eec875d6d1/pkg/client/clientset/versioned/typed/objectbucket.io/v1alpha1/objectbucket.go:71:5: not enough arguments in call to c.client.Get().Resource("objectbuckets").Name(name).VersionedParams(&options, scheme.ParameterCodec).Do
	have ()
	want (context.Context)
/home/arun/go/pkg/mod/github.com/kube-object-storage/lib-bucket-provisioner@v0.0.0-20200610144127-e2eec875d6d1/pkg/client/clientset/versioned/typed/objectbucket.io/v1alpha1/objectbucket.go:87:5: not enough arguments in call to c.client.Get().Resource("objectbuckets").VersionedParams(&opts, scheme.ParameterCodec).Timeout(timeout).Do
	have ()
	want (context.Context)

leseb · 2020-11-12T08:35:35Z

Addressed all other issues, but now I have hit the following lib-bucket-provisioner error

/home/arun/go/pkg/mod/github.com/kube-object-storage/lib-bucket-provisioner@v0.0.0-20200610144127-e2eec875d6d1/pkg/client/clientset/versioned/typed/objectbucket.io/v1alpha1/objectbucket.go:71:5: not enough arguments in call to c.client.Get().Resource("objectbuckets").Name(name).VersionedParams(&options, scheme.ParameterCodec).Do
	have ()
	want (context.Context)
/home/arun/go/pkg/mod/github.com/kube-object-storage/lib-bucket-provisioner@v0.0.0-20200610144127-e2eec875d6d1/pkg/client/clientset/versioned/typed/objectbucket.io/v1alpha1/objectbucket.go:87:5: not enough arguments in call to c.client.Get().Resource("objectbuckets").VersionedParams(&opts, scheme.ParameterCodec).Timeout(timeout).Do
	have ()
	want (context.Context)

You might need to make a PR against https://github.com/kube-object-storage/lib-bucket-provisioner

BlaineEXE · 2020-11-12T21:12:42Z

Given the timing of the v1.5.0 release

should this block release of v1.5,
should this be included as an update to v1.5,
or should this go into v1.6?

@travisn and @leseb
My gut check is option 3 but wanted to check in.

leseb · 2020-11-13T14:37:23Z

Given the timing of the v1.5.0 release

should this block release of v1.5,

should this be included as an update to v1.5,

or should this go into v1.6?

@travisn and @leseb
My gut check is option 3 but wanted to check in.

Let's discuss today, in the meantime, I have raised kube-object-storage/lib-bucket-provisioner#197
Once merged we should be able to get this one in.

leseb · 2020-11-13T15:27:48Z

@aruniiird my PR on lib-bucket-provisioner has been merged you can rebase your work on top of it.

aruniiird · 2020-11-16T23:29:23Z

All the go vet errors are taken care of. Handling sig-storage-lib-external-provisioner updated api errors...

aruniiird · 2020-11-17T01:32:03Z

All the lint / vet errors are handled...
@leseb , @travisn @BlaineEXE , please take a look

leseb · 2020-11-17T13:13:57Z

pkg/daemon/ceph/agent/flexvolume/attachment/crd.go

@@ -46,23 +48,27 @@ func New(context *clusterd.Context) (Attachment, error) {

 // Get queries the Volume CRD from Kubernetes
 func (c *crd) Get(namespace, name string) (*rookalpha.Volume, error) {
-	return c.context.RookClientset.RookV1alpha2().Volumes(namespace).Get(name, metav1.GetOptions{})
+	ctx := context.TODO()


you don't need ctx just pass context.TODO() directly.

Yup done...
Initial idea was to make changes to the attachment.Attachment interface itself (to match it the same with the latest api changes), but later refrained from it.

What's done I still see ctx := context.TODO()?

Corrected... I missed other lines...

I still don't see anything

leseb · 2020-11-17T13:18:49Z

pkg/operator/ceph/operator.go

@@ -120,13 +121,17 @@ func (o *Operator) Run() error {
 		}
 	}

+	// creating a context
+	stopContext, stopFunc := context.WithCancel(context.Background())


please rename stopFunc to contextCancel it's clearer and stopContext just ctx, it's more common.

also, how about using defer instead of calling stopFunc() everywhere?

Good point... Yup made the change...

mergify · 2020-11-17T17:42:22Z

This pull request has merge conflicts that must be resolved before it can be merged. @aruniiird please rebase it. https://rook.io/docs/rook/master/development-flow.html#updating-your-fork

Updating the dependencies' versions to match with the newer Operator SDK version v1.x Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

Fetched latest lib-bucket-provisioner changes as well. Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

We must add the finalizer right after the object creation otherwise the seerver will later return an error on update that the object has been modified. Indeed, it has been by the task that updates the status when the object is first created. Signed-off-by: Sébastien Han <seb@redhat.com>

We don't need to lint go.sum since it's auto generated. Signed-off-by: Sébastien Han <seb@redhat.com>

BlaineEXE · 2020-11-18T19:43:33Z

How close is this to being merged? I'm building multiple fixes for #6650 on top of this for now.

umangachapagain

Would it make sense to merge first 4 commits into 1? It's all part of single deps upgrade.

Also, let's not mention SDK here. This is more about supporting K8s 1.19 and Controller Runtime 0.6.z.

leseb · 2020-11-19T08:34:19Z

How close is this to being merged? I'm building multiple fixes for #6650 on top of this for now.

It will be merged today, I want to manually test it.

leseb

Successfully tested the change, no side effects observed.

Bump Controller Runtime version to 0.6 (bp #6568)

umangachapagain requested review from leseb and travisn November 6, 2020 13:40

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch from 3456b4d to d4a6021 Compare November 6, 2020 13:55

travisn added backport-release-1.5 ceph main ceph tag labels Nov 10, 2020

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch from d4a6021 to c703e48 Compare November 10, 2020 21:21

leseb force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch from c703e48 to 0ee8420 Compare November 16, 2020 16:03

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch 6 times, most recently from 8fefcf6 to 4964105 Compare November 16, 2020 22:39

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch 2 times, most recently from e7f155d to 732d29d Compare November 17, 2020 11:43

leseb requested changes Nov 17, 2020

View reviewed changes

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch 2 times, most recently from e738761 to d6370a6 Compare November 17, 2020 15:36

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch from d6370a6 to 20f500d Compare November 18, 2020 14:36

ceph: updating the dependencies for operator SDK v1.0.0

421f340

Updating the dependencies' versions to match with the newer Operator SDK version v1.x Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

ceph: changes made by running make codegen target

9ff9899

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch from 20f500d to e3b9241 Compare November 18, 2020 15:36

aruniiird added 2 commits November 18, 2020 21:14

ceph: manual changes needed for kubernetes api updates

65d16bf

Fetched latest lib-bucket-provisioner changes as well. Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

ceph: changes for 'sigs.k8s.io/sig-storage-lib-external-provisioner/v6'

ded16f7

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch 2 times, most recently from ddb1419 to 25cf3f4 Compare November 18, 2020 16:38

ceph: changes after the latest multus CSI updates

f5fc08b

Signed-off-by: Arun Kumar Mohan <amohan@redhat.com>

aruniiird force-pushed the upgrade-dependencies-for-operator-sdk-1.x branch from 25cf3f4 to f5fc08b Compare November 18, 2020 16:41

leseb added 2 commits November 18, 2020 18:16

ci: skip codespell on go.sum

cd08296

We don't need to lint go.sum since it's auto generated. Signed-off-by: Sébastien Han <seb@redhat.com>

BlaineEXE mentioned this pull request Nov 18, 2020

Ceph fix object bucket claim cleanup #6672

Closed

10 tasks

umangachapagain reviewed Nov 19, 2020

View reviewed changes

leseb changed the title ~~Updating the dependencies for operator SDK v1.0.0~~ Bump Controller Runtime version to 0.6 Nov 19, 2020

leseb approved these changes Nov 19, 2020

View reviewed changes

umangachapagain approved these changes Nov 19, 2020

View reviewed changes

leseb removed the backport-release-1.5 label Nov 19, 2020

leseb merged commit f86f830 into rook:master Nov 19, 2020

leseb added the backport-release-1.5 label Nov 20, 2020

mergify bot mentioned this pull request Nov 20, 2020

Bump Controller Runtime version to 0.6 (bp #6568) #6684

Merged

mergify bot added a commit that referenced this pull request Nov 24, 2020

Merge pull request #6684 from rook/mergify/bp/release-1.5/pr-6568

69e5ba9

Bump Controller Runtime version to 0.6 (bp #6568)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump Controller Runtime version to 0.6 #6568

Bump Controller Runtime version to 0.6 #6568

aruniiird commented Nov 6, 2020

aruniiird commented Nov 6, 2020

travisn commented Nov 6, 2020

aruniiird commented Nov 10, 2020

leseb commented Nov 12, 2020

BlaineEXE commented Nov 12, 2020

leseb commented Nov 13, 2020

leseb commented Nov 13, 2020

aruniiird commented Nov 16, 2020

aruniiird commented Nov 17, 2020

leseb Nov 17, 2020

aruniiird Nov 17, 2020

leseb Nov 17, 2020

aruniiird Nov 17, 2020

leseb Nov 17, 2020

leseb Nov 17, 2020

leseb Nov 17, 2020

aruniiird Nov 17, 2020

mergify bot commented Nov 17, 2020

BlaineEXE commented Nov 18, 2020

umangachapagain left a comment

leseb commented Nov 19, 2020

leseb left a comment

Bump Controller Runtime version to 0.6 #6568

Bump Controller Runtime version to 0.6 #6568

Conversation

aruniiird commented Nov 6, 2020

aruniiird commented Nov 6, 2020

travisn commented Nov 6, 2020

aruniiird commented Nov 10, 2020

leseb commented Nov 12, 2020

BlaineEXE commented Nov 12, 2020

leseb commented Nov 13, 2020

leseb commented Nov 13, 2020

aruniiird commented Nov 16, 2020

aruniiird commented Nov 17, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mergify bot commented Nov 17, 2020

BlaineEXE commented Nov 18, 2020

umangachapagain left a comment

Choose a reason for hiding this comment

leseb commented Nov 19, 2020

leseb left a comment

Choose a reason for hiding this comment