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

Improve wording for OIDC Kubeconfig settings #6656

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Improve wording for OIDC Kubeconfig settings #6656

merged 1 commit into from
Apr 16, 2024

Conversation

ahmedwaleedmalik
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik commented Apr 16, 2024 •
edited
Loading

What this PR does / why we need it:
Better wording to make the OIDC/admin Kubeconfig settings more coherent.

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?

/kind chore

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

NONE

Documentation:

NONE

@ahmedwaleedmalik
Improve wording for OIDC kubeconfig settings
8f6ec86 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik self-assigned this Apr 16, 2024
@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 16, 2024
@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v2.25

@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v2.24

@kubermatic-bot
Copy link
Contributor

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

In response to this:

/cherry-pick release/v2.25

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.

@kubermatic-bot
Copy link
Contributor

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

In response to this:

/cherry-pick release/v2.24

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.

@ahmedwaleedmalik
Copy link
Member Author

/cherry-pick release/v2.23

@kubermatic-bot
Copy link
Contributor

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

In response to this:

/cherry-pick release/v2.23

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.

ahmadhamzh
ahmadhamzh approved these changes Apr 16, 2024
View reviewed changes
Copy link
Contributor

@ahmadhamzh ahmadhamzh left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 16, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3d8f4a18097926bdbdf5d6684138cdab843e7972

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmadhamzh

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2024
@kubermatic-bot kubermatic-bot merged commit 70cdfe7 into kubermatic:main Apr 16, 2024
7 of 8 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.26 milestone Apr 16, 2024
@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #6656 failed to apply on top of branch "release/v2.23":

Applying: Improve wording for OIDC kubeconfig settings
Using index info to reconstruct a base tree...
M	modules/web/src/app/settings/admin/defaults/style.scss
M	modules/web/src/app/settings/admin/defaults/template.html
Falling back to patching base and 3-way merge...
Auto-merging modules/web/src/app/settings/admin/defaults/template.html
CONFLICT (content): Merge conflict in modules/web/src/app/settings/admin/defaults/template.html
Auto-merging modules/web/src/app/settings/admin/defaults/style.scss
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improve wording for OIDC kubeconfig settings
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:

/cherry-pick release/v2.23

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.

@kubermatic-bot kubermatic-bot mentioned this pull request Apr 16, 2024
Merged
@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: new pull request created: #6657

In response to this:

/cherry-pick release/v2.25

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.

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #6656 failed to apply on top of branch "release/v2.24":

Applying: Improve wording for OIDC kubeconfig settings
Using index info to reconstruct a base tree...
M	modules/web/src/app/settings/admin/defaults/style.scss
M	modules/web/src/app/settings/admin/defaults/template.html
Falling back to patching base and 3-way merge...
Auto-merging modules/web/src/app/settings/admin/defaults/template.html
CONFLICT (content): Merge conflict in modules/web/src/app/settings/admin/defaults/template.html
Auto-merging modules/web/src/app/settings/admin/defaults/style.scss
CONFLICT (content): Merge conflict in modules/web/src/app/settings/admin/defaults/style.scss
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Improve wording for OIDC kubeconfig settings
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:

/cherry-pick release/v2.24

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.

@ahmedwaleedmalik ahmedwaleedmalik deleted the oidc-kubeconfig-wording branch April 16, 2024 10:47
ahmedwaleedmalik added a commit to ahmedwaleedmalik/dashboard that referenced this pull request Apr 16, 2024
@ahmedwaleedmalik
Improve wording for OIDC kubeconfig settings (kubermatic#6656)
a0cf426 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Apr 16, 2024
Merged
ahmedwaleedmalik added a commit to ahmedwaleedmalik/dashboard that referenced this pull request Apr 16, 2024
@ahmedwaleedmalik
Improve wording for OIDC kubeconfig settings (kubermatic#6656)
e7aec05 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Apr 16, 2024
Merged
kubermatic-bot pushed a commit that referenced this pull request Apr 16, 2024
@ahmedwaleedmalik
Improve wording for OIDC kubeconfig settings (#6656) (#6659)
d6cd200 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
kubermatic-bot pushed a commit that referenced this pull request Apr 16, 2024
@ahmedwaleedmalik
Improve wording for OIDC kubeconfig settings (#6656) (#6658)
e55b994 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahmadhamzh ahmadhamzh ahmadhamzh approved these changes

Assignees

@ahmedwaleedmalik ahmedwaleedmalik

@ahmadhamzh ahmadhamzh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/chore Updating grunt tasks etc; no production code changes. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
KKP 2.26
Development

Successfully merging this pull request may close these issues.
3 participants
@ahmedwaleedmalik @kubermatic-bot @ahmadhamzh