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.

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

Patch Calico V3.14.0 roles, missing CR and CRD for calico_kube_controller #6276

Merged
merged 1 commit into from
Jul 1, 2020

Conversation

nurekage
Copy link

What type of PR is this?

/kind bug

What this PR does / why we need it:

Ensures existence of CRD "kubecontrollersconfigurations" and defines rbac for this CR

Which issue(s) this PR fixes:

Fixes #6275

Special notes for your reviewer:

We patched live didn't test kubespray deploy (issue came after a gracefull upgrade)

Does this PR introduce a user-facing change?:
No idea

Add kubecontrollersconfigurations CRD in kdd-crds.yml in roles/network_plugins/calico/templates and corresponding CR in roles/kubernetes_apps/policy_controller/calico/templates/calico_kube_cr.yml
Also defined missing "hostendpoints" CR in roles/kubernetes_apps/policy_controller/calico/templates/calico_kube_cr.yml

Source https://docs.projectcalico.org/manifests/calico.yaml

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jun 16, 2020
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
  • If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
  • Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: [email protected]

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 16, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @nurekage!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @nurekage. 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 added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 16, 2020
@floryut
Copy link
Member

floryut commented Jun 16, 2020

@nurekage Thank you for the PR, Can you sign CLA ?
/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 Jun 16, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 16, 2020
@hafe
Copy link
Contributor

hafe commented Jun 17, 2020

solves #6275, same problem

@@ -212,7 +212,11 @@ spec:
{% endif %}
{% if calico_version is version('v3.14.0', '>=') %}
---
{% if kube_version is version('1.19.0', '>=') %}
apiVersion: apiextensions.k8s.io/v1
Copy link
Author

@nurekage nurekage Jun 24, 2020

Choose a reason for hiding this comment

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

I tried this but doesn't seem to pass
As said 1.19 isn't out and v1beta1 won't be going away that fast.

Copy link
Member

Choose a reason for hiding this comment

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

Go ahead with your change, I'll rebase and package everything with my crd PR when kube-ovn release their CRD under v1

@nurekage
Copy link
Author

/assign @Atoms

@floryut
Copy link
Member

floryut commented Jun 25, 2020

On a side note, you can find the CRD v1 here

@hafe
Copy link
Contributor

hafe commented Jun 25, 2020

I guess you should remove the last two commits and keep the first one.

@floryut
Copy link
Member

floryut commented Jun 29, 2020

@nurekage The latest CI error you have is due to your branch being outdated :/
Could you rebase master please ?

@hafe
Copy link
Contributor

hafe commented Jul 1, 2020

See #6360

@LuckySB
Copy link
Contributor

LuckySB commented Jul 1, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LuckySB, nurekage

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 Jul 1, 2020
@floryut
Copy link
Member

floryut commented Jul 1, 2020

/lgtm

@hafe will update this one if need be

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 1, 2020
@k8s-ci-robot k8s-ci-robot merged commit 017df71 into kubernetes-sigs:master Jul 1, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Jul 1, 2020
* 'master' of https:/kubernetes-sigs/kubespray:
  Patch Calico for V3.14.0 missing CR and CRD (kubernetes-sigs#6276)
  Explicitly set ETCDCTL_API and use ETCDCTL_ENDPOINTS (kubernetes-sigs#6327)
  Add additional metadata configuration options to external Openstack CCM (kubernetes-sigs#6338) (kubernetes-sigs#6339)
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Sep 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

calico with kubernetes datastore does not work
7 participants