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 editing local rke1 and eks clusters #12583

Conversation

mantis-toboggan-md
Copy link
Member

@mantis-toboggan-md mantis-toboggan-md commented Nov 12, 2024

Summary

Fixes #12506
Fixes #12339

Fixes #12576

Occurred changes and/or fixed issues

This PR reverts #12177 as well as much of #9868

Technical notes summary

I reverted most of #9868 and moved a critical component of that fix into a display-only property, so it would not interfere with iframed edit pages (causing #12506 and #12339). I also found a simpler approach to determining whether or not a cluster is imported, which doesn't depend on ember query params: as noted in pre-existing inline documentation, constructing those ember params involves "much indirect mapping" -- in other words, it's difficult to follow.

Areas or cases that should be tested

Verify the provider/distro column of the cluster management list view as well as the edit config view for each of the following:
local clusters:

  • rke1
  • rke2
  • k3s
  • built-in kontainer (AKS, EKS, GKE)

downstream clusters:

  • rke1 provisioned
  • rke2 provisioned
  • k3s provisioned
  • rke1 imported
  • rke2 imported
  • k3s imported
  • kontainer imported (AKS, EKS, GKE)

Areas which could experience regressions

The provider/distro column of the cluster management list view, as well as any iframed ember cluster edit page, could experience regressions. We also need to be sure we haven't re-introduced:

#6836
#11874

Screenshot/Video

release-2.10:
Screenshot 2024-11-12 at 10 02 36 AM

this pr:
Screenshot 2024-11-12 at 10 03 02 AM

Checklist

  • The PR is linked to an issue and the linked issue has a Milestone, or no issue is needed
  • The PR has a Milestone
  • The PR template has been filled out
  • The PR has been self reviewed
  • The PR has a reviewer assigned
  • The PR has automated tests or clear instructions for manual tests and the linked issue has appropriate QA labels, or tests are not needed
  • The PR has reviewed with UX and tested in light and dark mode, or there are no UX changes

@mantis-toboggan-md
Copy link
Member Author

/backport v2.10.0

codyrancher
codyrancher previously approved these changes Nov 12, 2024
@mantis-toboggan-md
Copy link
Member Author

Updated to fix an e2e test: https://github.com/rancher/dashboard/actions/runs/11803005939/job/32886518312?pr=12583#step:9:84

Looks like these CLI downloads succeed now, on master anyway

@mantis-toboggan-md mantis-toboggan-md merged commit 6f52e59 into rancher:master Nov 12, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants