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

check if 'plugins' key exists in calico_cni_config object #7717

Merged
merged 3 commits into from
Sep 27, 2021
Merged

check if 'plugins' key exists in calico_cni_config object #7717

merged 3 commits into from
Sep 27, 2021

Conversation

dlouks
Copy link
Contributor

@dlouks dlouks commented Jun 16, 2021 •
edited by floryut
Loading

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:
Allows users to add nodes to cluster using cluster.yml as well as scale.yml

Which issue(s) this PR fixes:

Fixes #7711

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

[Calico] Check if 'plugins' key exists in `calico_cni_config` object allowing user to add nodes using both playbooks

@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. labels Jun 16, 2021
@k8s-ci-robot k8s-ci-robot requested review from holmsten and oomichi June 16, 2021 13:51
@k8s-ci-robot
Copy link
Contributor

Hi @dlouks. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 16, 2021
@k8s-triage-robot
Copy link

The Kubernetes project currently lacks enough contributors to adequately respond to all issues and PRs.

This bot triages issues and PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the issue is closed

You can:

  • Mark this issue or PR as fresh with /remove-lifecycle stale
  • Mark this issue or PR as rotten with /lifecycle rotten
  • Close this issue or PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Sep 14, 2021
@dlouks
Copy link
Contributor Author

dlouks commented Sep 14, 2021

/remove-lifecycle stale

@k8s-ci-robot k8s-ci-robot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Sep 14, 2021
@floryut
Copy link
Member

floryut commented Sep 15, 2021

/remove-lifecycle stale

You should then update your PR so that linting doesn't fail 👍

oomichi
oomichi reviewed Sep 22, 2021
View reviewed changes
roles/network_plugin/calico/tasks/pre.yml Outdated
@@ -12,7 +12,9 @@
- name: Set fact calico_datastore to etcd if needed
set_fact:
calico_datastore: etcd
when: "'etcd_endpoints' in calico_cni_config.plugins.0"
when:
Copy link
Contributor

Choose a reason for hiding this comment

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

Please check the failing job as https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/1352119588
The job says this line contains unnecessary space at the end of line:

roles/network_plugin/calico/tasks/pre.yml:15: [E201] Trailing whitespace

@floryut
Copy link
Member

floryut commented Sep 24, 2021

@dlouks Are you available to fix this PR ? (rebase and fix lint)

@dlouks
Copy link
Contributor Author

dlouks commented Sep 24, 2021

@floryut @oomichi - Sorry for missing this! I'll get an update in now.

floryut
floryut approved these changes Sep 24, 2021
View reviewed changes
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

/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 Sep 24, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dlouks, floryut

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 24, 2021
@oomichi
Copy link
Contributor

oomichi commented Sep 27, 2021

Thanks for updating.

/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 27, 2021
@k8s-ci-robot k8s-ci-robot merged commit 1472528 into kubernetes-sigs:master Sep 27, 2021
@floryut floryut added kind/network Network section in the release note and removed kind/bug Categorizes issue or PR as related to a bug. labels Sep 28, 2021
oomichi pushed a commit to oomichi/kubespray that referenced this pull request Sep 29, 2021
@dlouks
check if 'plugins' key exists in calico_cni_config object (kubernetes…
1711100 
…-sigs#7717)

* check if 'plugins' key exists in calico_cni_config object

* fix whitespace linting error

* fixed when list indentation
k8s-ci-robot pushed a commit that referenced this pull request Sep 30, 2021
@oomichi @dlouks
check if 'plugins' key exists in calico_cni_config object (#7717) (#8040
3b2b618 
)

* check if 'plugins' key exists in calico_cni_config object

* fix whitespace linting error

* fixed when list indentation

Co-authored-by: David Louks <[email protected]>
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Oct 23, 2021
@dlouks @LuckySB
check if 'plugins' key exists in calico_cni_config object (kubernetes…
a98a757 
…-sigs#7717)

* check if 'plugins' key exists in calico_cni_config object

* fix whitespace linting error

* fixed when list indentation
@floryut floryut mentioned this pull request Dec 21, 2021
Closed
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
@dlouks @sakuraiyuta
check if 'plugins' key exists in calico_cni_config object (kubernetes…
747e155 
…-sigs#7717)

* check if 'plugins' key exists in calico_cni_config object

* fix whitespace linting error

* fixed when list indentation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oomichi oomichi oomichi left review comments

@floryut floryut floryut approved these changes

@holmsten holmsten Awaiting requested review from holmsten

Assignees

@oomichi oomichi

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/network Network section in the release note 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Slurpped calico_cni_config object does not have a plugins key when adding new node
5 participants
@dlouks @k8s-ci-robot @k8s-triage-robot @floryut @oomichi