Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update calico crds and cr #6360

Merged
merged 1 commit into from
Sep 3, 2020
Merged

Update calico crds and cr #6360

merged 1 commit into from
Sep 3, 2020

Conversation

hafe
Copy link
Contributor

@hafe hafe commented Jul 1, 2020

  • Add CustomResourceDefinition for kubecontrollersconfigurations.crd.projectcalico.org
  • Update ClusterRole with access to hostendpoints and kubecontrollersconfigurations

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change

/kind bug

/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

Calico with kdd datastore does not work

Which issue(s) this PR fixes:

Fixes #6275

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 1, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @hafe. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot requested review from EppO and floryut July 1, 2020 15:18
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 1, 2020
@hafe hafe mentioned this pull request Jul 1, 2020
Merged
@floryut
Copy link
Member

floryut commented Jul 1, 2020

Already PR by #6276 (but you put crd v1 so I kind of like this one :D )

@hafe
Copy link
Contributor Author

hafe commented Jul 1, 2020

Yeah that pr seemed a bit dead and I needed this so...

@floryut
Copy link
Member

floryut commented Jul 1, 2020

Yeah that pr seemed a bit dead and I needed this so...

Ok Lucky just approved it, so let me lgtm and you can update yours to add crd v1 if that's ok with you ?

@hafe
Copy link
Contributor Author

hafe commented Jul 1, 2020

Yeah that pr seemed a bit dead and I needed this so...

Ok Lucky just approved it, so let me lgtm and you can update yours to add crd v1 if that's ok with you ?

not sure I understand, what should I add? It is already crd v1

@floryut
Copy link
Member

floryut commented Jul 1, 2020

Yeah that pr seemed a bit dead and I needed this so...

Ok Lucky just approved it, so let me lgtm and you can update yours to add crd v1 if that's ok with you ?

not sure I understand, what should I add? It is already crd v1

In yours yes, but 6276 is going to be merge with crd as beta1, so if you could rebase yours after it's merge to update it that'd great 👍

@hafe
Copy link
Contributor Author

hafe commented Jul 1, 2020

Yeah that pr seemed a bit dead and I needed this so...

Ok Lucky just approved it, so let me lgtm and you can update yours to add crd v1 if that's ok with you ?

not sure I understand, what should I add? It is already crd v1

In yours yes, but 6276 is going to be merge with crd as beta1, so if you could rebase yours after it's merge to update it that'd great 👍

Sure , I will do that

floryut
floryut reviewed Jul 2, 2020
View reviewed changes
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-cr.yml.j2
@@ -72,8 +81,6 @@ rules:
- get
- create
- update
{% endif %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure about that ? the part below isn't needed when not in kdd mode ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok will add it back

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure about that ? the part below isn't needed when not in kdd mode ?

I was a bit quick. Access to kubecontrollersconfigurations is only needed in kdd mode. See manifests at:
https://docs.projectcalico.org/getting-started/kubernetes/self-managed-onprem/onpremises
I searched for kubecontrollersconfigurations in the etcd manifest.
Do you still want the version check?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good that way I'd say

@floryut
Copy link
Member

floryut commented Jul 6, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 6, 2020
@hafe hafe force-pushed the calico-update-6275 branch 2 times, most recently from 661e6fb to 152bd19 Compare July 25, 2020 06:54
@hafe
Copy link
Contributor Author

hafe commented Jul 27, 2020

/retest

@hafe
Copy link
Contributor Author

hafe commented Aug 1, 2020

/assign @Miouge1

@hafe
Calico: update crds to v1 and cr
bb26efc 
* Update CustomResourceDefinition for kubecontrollersconfigurations.crd.projectcalico.org to v1
* Align ClusterRole for kube-controllers with upstream (calico)
@hafe
Copy link
Contributor Author

hafe commented Aug 12, 2020

/retest

@hafe
Copy link
Contributor Author

hafe commented Aug 31, 2020

What remains to get this merged?

@EppO
Copy link
Contributor

EppO commented Sep 1, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 1, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Sep 3, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hafe, Miouge1

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 3, 2020
@k8s-ci-robot k8s-ci-robot merged commit 93698a8 into kubernetes-sigs:master Sep 3, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Sep 12, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
d158807 
* 'master' of https://github.com/kubernetes-sigs/kubespray:
  Add protectKernelDefaults option (default true) to kubelet config file (kubernetes-sigs#6611)
  Rotate kubelet server certificate. (kubernetes-sigs#6453)
  Add snapshot-controller for CSI drivers and snapshot CRDs, add a default volumesnapshotclass when running cinder CSI (kubernetes-sigs#6537)
  Calico: update crds to v1 and cr (kubernetes-sigs#6360)
  Fix E306 in roles/network_plugin (kubernetes-sigs#6516)
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jan 15, 2021
@hafe @LuckySB
Calico: update crds to v1 and cr (kubernetes-sigs#6360)
6430afa 
* Update CustomResourceDefinition for kubecontrollersconfigurations.crd.projectcalico.org to v1
* Align ClusterRole for kube-controllers with upstream (calico)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut left review comments

@EppO EppO Awaiting requested review from EppO

Assignees

@EppO EppO

@Miouge1 Miouge1

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

calico with kubernetes datastore does not work
5 participants
@hafe @k8s-ci-robot @floryut @EppO @Miouge1