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

FIx Cilium deploy additionally with etcd kubeadm #6514

Merged
merged 1 commit into from
Aug 18, 2020
Merged

FIx Cilium deploy additionally with etcd kubeadm #6514

merged 1 commit into from
Aug 18, 2020

Conversation

MrFreezeex
Copy link
Member

@MrFreezeex MrFreezeex commented Aug 9, 2020 •
edited
Loading

What type of PR is this?

/kind bug

What this PR does / why we need it:
Cilium deployed with cilium_deploy_additionally on a cluster with etcd_kubeadm_enableddoesn't work. This PR resolves this issue.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@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 Aug 9, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @MrFreezeex. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 9, 2020
@k8s-ci-robot k8s-ci-robot requested review from EppO and floryut August 9, 2020 21:02
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 9, 2020
@MrFreezeex MrFreezeex force-pushed the cilium-etcd-kubeadm branch from e4b6ed9 to cf26b25 Compare August 9, 2020 21:08
@MrFreezeex MrFreezeex changed the title Cilium etcd kubeadm FIx Cilium deployment with etcd kubeadm Aug 9, 2020
@MrFreezeex MrFreezeex force-pushed the cilium-etcd-kubeadm branch 6 times, most recently from b4e7955 to 5e32bbc Compare August 10, 2020 00:15
@MrFreezeex MrFreezeex changed the title FIx Cilium deployment with etcd kubeadm WIP: FIx Cilium deployment with etcd kubeadm Aug 10, 2020
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 10, 2020
@MrFreezeex MrFreezeex force-pushed the cilium-etcd-kubeadm branch 2 times, most recently from c6cbd25 to 00b65a6 Compare August 10, 2020 11:03
@MrFreezeex MrFreezeex changed the title WIP: FIx Cilium deployment with etcd kubeadm FIx Cilium deployment with etcd kubeadm Aug 10, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 10, 2020
@MrFreezeex
Copy link
Member Author

MrFreezeex commented Aug 10, 2020 •
edited
Loading

It's ready for a review. I struggled a lot as the "separate" mode is not suited for etcd_kubeadm_enabled because the etcd node is separated from master. I think that you can't separate those with etcd_kubeadm_enabled but correct me if I'm wrong.

Here is the test that passed https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/-/jobs/678449296 (same code again but in a different commit to trigger the test).

@hafe
Copy link
Contributor

hafe commented Aug 10, 2020

doesn't this task work?

kubespray/roles/kubernetes/kubeadm/tasks/main.yml

Line 175 in 49158db

- name: Extract etcd certs from control plane if using etcd kubeadm mode

@MrFreezeex
Fix cilium_deploy_additionally with kubeadm etcd
0d257d2 
Signed-off-by: Arthur Outhenin-Chalandre <[email protected]>
@MrFreezeex MrFreezeex force-pushed the cilium-etcd-kubeadm branch from 00b65a6 to 0d257d2 Compare August 11, 2020 00:37
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 11, 2020
@MrFreezeex
Copy link
Member Author

MrFreezeex commented Aug 11, 2020 •
edited
Loading

doesn't this task work?

kubespray/roles/kubernetes/kubeadm/tasks/main.yml

Line 175 in 49158db

- name: Extract etcd certs from control plane if using etcd kubeadm mode

Ohhh I now understand why this didn't work for me, thanks! It should be better in the last commit.

@MrFreezeex MrFreezeex changed the title FIx Cilium deployment with etcd kubeadm FIx Cilium deploy additionally with etcd kubeadm Aug 11, 2020
@floryut
Copy link
Member

floryut commented Aug 11, 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 Aug 11, 2020
@floryut
Copy link
Member

floryut commented Aug 11, 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 Aug 11, 2020
@mattymo
Copy link
Contributor

mattymo commented Aug 18, 2020

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattymo, MrFreezeex

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 Aug 18, 2020
@k8s-ci-robot k8s-ci-robot merged commit 33ec132 into kubernetes-sigs:master Aug 18, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Aug 18, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
3cd81d6 
* 'master' of https://github.com/kubernetes-sigs/kubespray:
  Allow hosts with hyphen in name (kubernetes-sigs#6529)
  Update apiserver-audit-policy.yaml.j2 (kubernetes-sigs#6526)
  add master_volume_type variable (kubernetes-sigs#6524)
  Remove unused variable (kubernetes-sigs#6522)
  Add new cilium options for native routing (kubernetes-sigs#6519)
  Fixed Kubespray container-engine/docker role to populate docker.service (kubernetes-sigs#6518)
  Fix cilium_deploy_additionally with kubeadm etcd (kubernetes-sigs#6514)
  improve Cilium metrics support (kubernetes-sigs#6513)
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jan 10, 2021
@MrFreezeex @LuckySB
Fix cilium_deploy_additionally with kubeadm etcd (kubernetes-sigs#6514)
3558a9e 
Signed-off-by: Arthur Outhenin-Chalandre <[email protected]>
@MrFreezeex MrFreezeex mentioned this pull request Mar 14, 2023
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EppO EppO Awaiting requested review from EppO

@floryut floryut Awaiting requested review from floryut

Assignees

@mattymo mattymo

@floryut floryut

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/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.
5 participants
@MrFreezeex @k8s-ci-robot @hafe @floryut @mattymo