Fix etcd certificates reference to support etcd_kubeadm_enabled:true #7766

forselli-stratio · 2021-06-30T13:49:48Z

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:
This PR fixes some etcd certificates reference, there are many references in other playbooks but i'm not really sure where this replace is needed, please take a look and let me know if these changes are necessary in other playbooks.

Which issue(s) this PR fixes:
Fixes #7765

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Fix etcd certificates reference to support `etcd_kubeadm_enabled: true`

k8s-ci-robot · 2021-06-30T13:49:56Z

Hi @forselli-stratio. 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.

floryut

/ok-to-test
/cc @champtar @oomichi

k8s-ci-robot · 2021-09-24T09:45:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, forselli-stratio

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:

~~OWNERS~~ [floryut]

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

oomichi

/cc @oomichi

roles/etcd/tasks/join_etcd_member.yml

oomichi · 2021-11-02T16:02:48Z

@forselli-stratio
Could you rebase this pull request on the latest master branch for kicking CI jobs again?
I cannot find any issue on current pull request, and it is better to re-run jobs.

forselli-stratio · 2021-12-21T09:13:00Z

/retest

oomichi · 2021-12-22T17:28:17Z

@forselli-stratio Could you rebase this pull request again?

git checkout master
git remote add upstream git://github.com/kubernetes-sigs/kubespray.git
git fetch upstream
git checkout etcd-static-pod-kubespray
git rebase master

forselli-stratio · 2022-01-10T10:42:27Z

Hi @oomichi , can you take a look at this please? Thanks!

oomichi

/lgtm

oomichi · 2022-01-10T23:21:50Z

roles/network_plugin/canal/tasks/main.yml

-    ETCDCTL_KEY_FILE: "{{ etcd_cert_dir }}/admin-{{ groups['etcd'][0] }}-key.pem"
+    ETCDCTL_CA_FILE: "{{ kube_cert_dir + '/etcd/ca.crt' if etcd_kubeadm_enabled else etcd_cert_dir + '/ca.pem' }}"
+    ETCDCTL_CERT_FILE: "{{ kube_cert_dir + '/etcd/server.crt' if etcd_kubeadm_enabled else etcd_cert_dir + '/admin-' + groups['etcd'][0] + '.pem' }}"
+    ETCDCTL_KEY_FILE: "{{ kube_cert_dir + '/etcd/server.key' if etcd_kubeadm_enabled else etcd_cert_dir + '/admin-' + groups['etcd'][0] + '-key.pem' }}"


According to

kubespray/roles/etcdctl/templates/etcdctl.sh.j2

Lines 5 to 8 in 57a1d18

etcdctl \

--cacert {{ kube_cert_dir }}/etcd/ca.crt \

--cert {{ kube_cert_dir }}/etcd/server.crt \

--key {{ kube_cert_dir }}/etcd/server.key "$@"

those paths seem good for me.

…ubernetes-sigs#7766) * Fix etcd certificates reference to support etcd_kubeadm_enabled:true * Add retries to ETCD Join Member task * Fix etcd certificates reference when etcd_kubeadm_enabled:true * Fix conflicts

k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jun 30, 2021

k8s-ci-robot requested review from bozzo and EppO June 30, 2021 13:49

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 30, 2021

floryut approved these changes Sep 24, 2021

View reviewed changes

k8s-ci-robot requested review from champtar and oomichi September 24, 2021 09:45

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2021

oomichi reviewed Oct 19, 2021

View reviewed changes

roles/etcd/tasks/join_etcd_member.yml Outdated Show resolved Hide resolved

k8s-ci-robot requested a review from oomichi October 19, 2021 17:18

unai-ttxu reviewed Oct 27, 2021

View reviewed changes

roles/etcd/tasks/join_etcd_member.yml Outdated Show resolved Hide resolved

forselli-stratio force-pushed the etcd-static-pod-kubespray branch from 64bf7ef to 8b91cfa Compare November 29, 2021 11:01

forselli-stratio force-pushed the etcd-static-pod-kubespray branch from 8b91cfa to e96c2ff Compare January 10, 2022 10:22

forselli-stratio added 3 commits January 10, 2022 11:27

Fix etcd certificates reference to support etcd_kubeadm_enabled:true

9997911

Add retries to ETCD Join Member task

224a362

Fix etcd certificates reference when etcd_kubeadm_enabled:true

e1d65ea

forselli-stratio force-pushed the etcd-static-pod-kubespray branch from c26087c to e1d65ea Compare January 10, 2022 10:27

Fix conflicts

5638c00

oomichi reviewed Jan 10, 2022

View reviewed changes

k8s-ci-robot assigned oomichi Jan 10, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 10, 2022

k8s-ci-robot merged commit df425ac into kubernetes-sigs:master Jan 10, 2022

oomichi mentioned this pull request May 28, 2022

Release Proposal v2.19 #8885

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix etcd certificates reference to support etcd_kubeadm_enabled:true #7766

Fix etcd certificates reference to support etcd_kubeadm_enabled:true #7766

forselli-stratio commented Jun 30, 2021 •

edited by floryut

Loading

k8s-ci-robot commented Jun 30, 2021

floryut left a comment

k8s-ci-robot commented Sep 24, 2021

oomichi left a comment

oomichi commented Nov 2, 2021

forselli-stratio commented Dec 21, 2021

oomichi commented Dec 22, 2021

forselli-stratio commented Jan 10, 2022

oomichi left a comment

oomichi Jan 10, 2022

	etcdctl \
	--cacert {{ kube_cert_dir }}/etcd/ca.crt \
	--cert {{ kube_cert_dir }}/etcd/server.crt \
	--key {{ kube_cert_dir }}/etcd/server.key "$@"

Fix etcd certificates reference to support etcd_kubeadm_enabled:true #7766

Fix etcd certificates reference to support etcd_kubeadm_enabled:true #7766

Conversation

forselli-stratio commented Jun 30, 2021 • edited by floryut Loading

k8s-ci-robot commented Jun 30, 2021

floryut left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Sep 24, 2021

oomichi left a comment

Choose a reason for hiding this comment

oomichi commented Nov 2, 2021

forselli-stratio commented Dec 21, 2021

oomichi commented Dec 22, 2021

forselli-stratio commented Jan 10, 2022

oomichi left a comment

Choose a reason for hiding this comment

oomichi Jan 10, 2022

Choose a reason for hiding this comment

forselli-stratio commented Jun 30, 2021 •

edited by floryut

Loading