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

fix: wrong EKS tag when upgrading older clusters #3783

Merged
merged 2 commits into from
Oct 19, 2022

Conversation

dkoshkin
Copy link
Contributor

@dkoshkin dkoshkin commented Oct 18, 2022

What type of PR is this?
/kind bug

What this PR does / why we need it:
After #3573, the AWS tag on a EKS cluster was changed. This was a good change to make everything more consistent, but it broke upgrading EKS clusters that were created with CAPA < v1.5.0.

In this PR, both the new and the previous tag formats will be checked and only fail if both are nil.

I also took the opportunity to clean up the error message, here is what it looked like before. It wasn't very clear what it was looking for and printed a nil error.

    - lastTransitionTime: "2022-09-22T10:01:30Z"
      message: 'checking owner of default_e2e-eks-upgrade-test-3618755-control-plane
        is e2e-eks-upgrade-test-3618755: %!!(MISSING)w(<nil>)'

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@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-priority size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 18, 2022
Co-authored-by: Daniel Lipovetsky <[email protected]>
@dlipovetsky
Copy link
Contributor

/cherrypick release-1.5

@k8s-infra-cherrypick-robot

@dlipovetsky: once the present PR merges, I will cherry-pick it on top of release-1.5 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.5

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.

@dlipovetsky
Copy link
Contributor

/cherrypick release-1.6

@k8s-infra-cherrypick-robot

@dlipovetsky: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.6

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.

@dlipovetsky
Copy link
Contributor

We test Kubernetes version upgrades using the same CAPA version for managed clusters, but I do not think we test CAPA upgrades themselves.

It would be nice to think of lighter-weight test that could catch this type of bug, but testing a CAPA upgrade would definitely work.

@faiq
Copy link
Contributor

faiq commented Oct 19, 2022

This is a really nice change. Should we consider removing the old tag as well and potentially getting rid of this extra code moving forward?

@dlipovetsky
Copy link
Contributor

/priority urgent

@k8s-ci-robot
Copy link
Contributor

@dlipovetsky: The label(s) priority/urgent cannot be applied, because the repository doesn't have them.

In response to this:

/priority urgent

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.

@dlipovetsky
Copy link
Contributor

/triage accepted

As far as I understand it, v1.5.0 and v2.0-beta are unable to reconcile an EKS cluster created with an earlier CAPA version, e.g., v1.4.x.

/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed needs-priority labels Oct 19, 2022
@dlipovetsky
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 19, 2022
@Skarlso
Copy link
Contributor

Skarlso commented Oct 19, 2022

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Skarlso

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 Oct 19, 2022
@Skarlso
Copy link
Contributor

Skarlso commented Oct 19, 2022

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 19, 2022
@Skarlso
Copy link
Contributor

Skarlso commented Oct 19, 2022

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 19, 2022
@k8s-ci-robot k8s-ci-robot merged commit e43049d into kubernetes-sigs:main Oct 19, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.x milestone Oct 19, 2022
@k8s-infra-cherrypick-robot

@dlipovetsky: new pull request created: #3786

In response to this:

/cherrypick release-1.6

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-infra-cherrypick-robot

@dlipovetsky: #3783 failed to apply on top of branch "release-1.5":

Applying: fix: wrong EKS tag when upgrading older clusters
Using index info to reconstruct a base tree...
M	pkg/cloud/services/eks/cluster.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloud/services/eks/cluster.go
CONFLICT (content): Merge conflict in pkg/cloud/services/eks/cluster.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: wrong EKS tag when upgrading older clusters
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.5

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.

@dlipovetsky
Copy link
Contributor

I'll look into the release-1.5 backport

@dlipovetsky
Copy link
Contributor

/cherrypick release-2.0

@k8s-infra-cherrypick-robot

@dlipovetsky: new pull request created: #3788

In response to this:

/cherrypick release-2.0

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.

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. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants