Closed AKamyshnikova closed 3 years ago
@AKamyshnikova can you rebase your branch on master ? When it's done I'll trigger all the end to end tests to confirm it doesn't break anything
@cscetbon Done
@AKamyshnikova you need to replace https://github.com/Orange-OpenSource/casskop/blob/8f63813343b3cbd19ac8c6ea6008d722a16ed04a/Makefile#L119 as well. Probably the image could be built in CircleCI as well. We had to use https://github.com/kubernetes-sigs/controller-tools/compare/master...erdrix:v0.3.0-forked_pr317 and that's what uses our build image, however it's been merged in the main repo so we should be good now (see https://github.com/kubernetes-sigs/controller-tools/blob/ea8d4ead3e34dac7bb792cedc6d3cd7decf63137/pkg/crd/schema.go#L166-L167)
@cscetbon What would be the best way to do this? Should I use your forked operator-sdk repo to build and upload new version of operator-sdk image?
I've updated code, but I don't have rights to upload new ci image.
@AKamyshnikova it fails with the new version of the build image, see https://app.circleci.com/pipelines/github/Orange-OpenSource/casskop/1636/workflows/dc14d951-ac39-4e2f-9fd1-3df55c08852d/jobs/16559. Still relates to the fix we applied. You can probably look into it by trying locally ?
@cscetbon sure, will look into this. Seems that required fix is only since controller-tools 0.4.0 https://github.com/kubernetes-sigs/controller-tools/pull/317/commits/71b6e916ad0a7ea1008bd00c679c6ccba893ccca Did you try using controller-gen directly for crd generation? I can try this approach if it will be accepted. Or I can make similar for fork for 19.x operator-sdk branch.
@cscetbon sure, will look into this. Seems that required fix is only since controller-tools 0.4.0 kubernetes-sigs/controller-tools@71b6e91 Did you try using controller-gen directly for crd generation? I can try this approach if it will be accepted. Or I can make similar for fork for 19.x operator-sdk branch.
We didn't try but if it works, go for it 👍
I've updated change using controller-gen directly, CRDs fields got reordered, but everything seems to be in place.
I left one comment and also asked if you can just double check regarding those CRDs changes. It seems to me it's just a reordering but please confirm it. Other than that it looks good
I double check CRD changes - just reorder. Thanks!
Update operator-sdk to 0.19.4 and related k8s.io modules to v0.19.13.
Bump go version to 1.16
Fixes #345
Signed-off-by: akamyshnikova akamyshnikova@mirantis.com
Checklist