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 etcd_events not getting upgraded in upgrade-cluster.yml #8550

Merged
merged 1 commit into from
Feb 17, 2022
Merged

Fix etcd_events not getting upgraded in upgrade-cluster.yml #8550

merged 1 commit into from
Feb 17, 2022

Conversation

mac-chaffee
Copy link
Contributor

@mac-chaffee mac-chaffee commented Feb 17, 2022 •
edited
Loading

What type of PR is this?
/kind bug

What this PR does / why we need it:

When running upgrade-cluster.yml, this PR makes it so that updates to etcd-events actually get applied (if enabled), just like regular etcd. This matches the behavior of cluster.yml, which does properly apply etcd-events updates:

kubespray/cluster.yml

Lines 46 to 48 in 063fc52

vars:
etcd_cluster_setup: true
etcd_events_cluster_setup: "{{ etcd_events_cluster_enabled }}"

Since the code I edited explicitly sets etcd_cluster_setup: true already, that indicates that we should be applying etcd updates at this phase, which ought to include etcd-events as well (if enabled).

This has been a bug for a long time but only recently became visible when the 2.18 upgrade changed the port number of etcd-events (#8232 ). Since that update does get applied to kube-apiserver but doesn't get applied to etcd-events itself, it causes upgrades to 2.18 to fail. May want to cherry-pick into 2.18, if possible.

Which issue(s) this PR fixes:

Fixes #8549

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Fixed a bug where upgrade-cluster.yaml would not apply updates to etcd-events

@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 Feb 17, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @mac-chaffee. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 17, 2022
@oomichi
Copy link
Contributor

oomichi commented Feb 17, 2022

Nice catch,

/ok-to-test
/lgtm

@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 Feb 17, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 17, 2022
@cristicalin
Copy link
Contributor

Thanks @mac-chaffee

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristicalin, mac-chaffee

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 Feb 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit 97c667f into kubernetes-sigs:master Feb 17, 2022
Quehenr pushed a commit to Quehenr/unstable-laboratory-infrastructure-kubespray that referenced this pull request Feb 18, 2022
Merge branch 'master' into feature/virtualbox
6fceccf 
* master:
  Configure Etcd container_manager explicitly (kubernetes-sigs#8521)
  Fix print_hostnames of inventory.py (kubernetes-sigs#8554)
  Fix etcd_events not getting upgraded in upgrade-cluster.yml (kubernetes-sigs#8550)
  nerdctl: upgrade to 0.16.1 (kubernetes-sigs#8539)
  Allow pausing after upgrade but before uncordon (kubernetes-sigs#8530)
  [calico] upgrade release checksums (kubernetes-sigs#8544)
  Allow to specify a source address for metallb peerings, and target only some nodes using node selectors (kubernetes-sigs#8534)
  add support for Dual Stack node InternalIP (kubernetes-sigs#8542)
  terraform/gcp: Allow to change extra disk types (kubernetes-sigs#8524)
  add support for Calico IP6_AUTODETECTION_METHOD (kubernetes-sigs#8541)
  implement download mirrors support (kubernetes-sigs#8474)
  Fix: Error when creating subnets more than AZ (kubernetes-sigs#8516)
  feat(offline): Improve generate_list.sh to generate offline file list using ansible (kubernetes-sigs#8537) (kubernetes-sigs#8538)
  docs: Update offline-environment.md for containerd (kubernetes-sigs#8520) (kubernetes-sigs#8523)
  Change Cilium setting identity_allocation_mode to cilium_identity_allocation_mode (kubernetes-sigs#8519)
  Fix wrong port name in metallb.yml.j2 (kubernetes-sigs#8510)
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
@mac-chaffee @sakuraiyuta
Fix etcd_events not getting upgraded in upgrade-cluster.yml (kubernet…
924b5f0 
…es-sigs#8550)

Signed-off-by: Mac Chaffee <[email protected]>
@oomichi oomichi mentioned this pull request May 28, 2022
Closed
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jun 29, 2023
@mac-chaffee @LuckySB
Fix etcd_events not getting upgraded in upgrade-cluster.yml (kubernet…
725bda9 
…es-sigs#8550)

Signed-off-by: Mac Chaffee <[email protected]>
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Oct 21, 2023
@mac-chaffee @LuckySB
Fix etcd_events not getting upgraded in upgrade-cluster.yml (kubernet…
73f1d9c 
…es-sigs#8550)

Signed-off-by: Mac Chaffee <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cristicalin cristicalin Awaiting requested review from cristicalin

@oomichi oomichi Awaiting requested review from oomichi

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/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.

v2.18 etcd-events port change breaks upgrade-cluster.yaml
4 participants
@mac-chaffee @k8s-ci-robot @oomichi @cristicalin