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: cluster-wizard UI & oidc-scopes #3209

Merged
merged 13 commits into from
Aug 27, 2024
Merged

fix: cluster-wizard UI & oidc-scopes #3209

merged 13 commits into from
Aug 27, 2024

Conversation

chriskari
Copy link
Contributor

@chriskari chriskari commented Aug 20, 2024 •
edited
Loading

Description

Changes proposed in this pull request:

  • fixed UI issues of cluster wizard
  • adjusted forms in cluster wizard to match UX specification
  • adjusted code to handle multiple scopes specified in the kubeconfig
  • changed scope input field to scopes list input
  • multiple scopes can be displayed in review step
  • adjusted unit test for oidc parsing

Related issue(s)
#3055 #3288

Definition of done

  • The PR's title starts with one of the following prefixes:
    • feat: A new feature
    • fix: A bug fix
    • docs: Documentation only changes
    • refactor: A code change that neither fixes a bug nor adds a feature
    • test: Adding tests
    • chore: Maintainance changes to the build process or auxiliary tools, libraries, workflows, etc.
  • Related issues are linked. To link internal trackers, use the issue IDs like backlog#4567
  • Explain clearly why you created the PR and what changes it introduces
  • All necessary steps are delivered, for example, tests, documentation, merging

@kyma-bot kyma-bot added cla: yes Indicates the PR's author has signed the CLA. labels Aug 20, 2024
@chriskari chriskari changed the title fix: scopes in cluster preview fix: scopes in cluster review Aug 20, 2024
@kyma-bot kyma-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 20, 2024
@chriskari chriskari linked an issue Aug 20, 2024 that may be closed by this pull request
ClusterPreview shows only one scope, even if there are multiple configured in the kubeconfig #3055
Closed
@kyma-bot kyma-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 21, 2024
@kyma-bot kyma-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 21, 2024
@kyma-bot kyma-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 25, 2024
@chriskari chriskari changed the title fix: scopes in cluster review fix: cluster-wizard UI & oidc-scopes Aug 25, 2024
@chriskari chriskari linked an issue Aug 25, 2024 that may be closed by this pull request
Login error when one or more --oidc-extra-scope args are present in the kubeconfig #3288
Closed
v0lkc
v0lkc reviewed Aug 26, 2024
View reviewed changes
src/components/Clusters/components/AddClusterWizard.js Outdated
if (!user?.user?.exec?.args?.includes('--oidc-extra-scope=openid')) {
user?.user?.exec?.args?.push('--oidc-extra-scope=openid');
}
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific reason why you don't want to go this way?

https://github.com/kyma-project/busola/pull/3289/files

Busola is trying to mimic the behavior of the kubelogin command, which does not require openid to be passed as --oidc-extra-scope. Imho you should implement it the same way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Christian, thanks for your review and contribution.
Yes you are correct, I was unaware of your PR, next time you could attach it to the issue to make it more apparent :D
I have a follow-up question to you: should all the defined --oidc-extra-scope be passed along with the openid scope in the scope argument of the UserManager constructor?

Copy link
Contributor Author

@chriskari chriskari Aug 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meaning if you have defined --oidc-extra-scope=scope_a, --oidc-extra-scope=scope_b should the scope passed to the oidc UserManager be scope: "openid scope_a scope_b"?

Copy link
Contributor

@v0lkc v0lkc Aug 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I thought it would be enough to link the fix to the issue. Next time I'll put it right at the beginning of the issue description. Regarding your question: you're right, the scopes have to be passed like this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, I will incorporate your changes in my PR 👍

@v0lkc v0lkc mentioned this pull request Aug 26, 2024
Closed
3 tasks
@chriskari chriskari force-pushed the fix-cluster-preview branch from 918b5c4 to 41abccf Compare August 26, 2024 11:19
akucharska
akucharska requested changes Aug 26, 2024
View reviewed changes
Copy link
Contributor

@akucharska akucharska left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Cancel button is in strange place
  2. Can we get rid of double scroll?
Screenshot 2024-08-26 at 15 54 01

@chriskari
Copy link
Contributor Author

I actually adjusted all of it, this is what it looks like for me locally:
image

@kyma-bot kyma-bot added the lgtm Looks good to me! label Aug 27, 2024
@kyma-bot kyma-bot merged commit b24c735 into kyma-project:main Aug 27, 2024
21 of 22 checks passed
@chriskari chriskari deleted the fix-cluster-preview branch October 8, 2024 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@v0lkc v0lkc v0lkc left review comments

@akucharska akucharska akucharska approved these changes

@mrCherry97 mrCherry97 Awaiting requested review from mrCherry97 mrCherry97 is a code owner

@OliwiaGowor OliwiaGowor Awaiting requested review from OliwiaGowor OliwiaGowor is a code owner

Assignees

@akucharska akucharska

Labels
cla: yes Indicates the PR's author has signed the CLA. lgtm Looks good to me! size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
4 participants
@chriskari @akucharska @v0lkc @kyma-bot