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 switch for sharing cluster #6340

Merged
merged 19 commits into from
Oct 30, 2023

Conversation

pkprzekwas
Copy link
Contributor

What this PR does / why we need it:
This PR changes the type of enableShareCluster to bool pointer in order to avoid defaulting this value to true each time settings are updated.

Which issue(s) this PR fixes:
Fixes #6329

What type of PR is this?
/kind bug

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

Fix `Enable Share Cluster` button in Admin Settings.

Documentation:

NONE

@pkprzekwas pkprzekwas added this to the KKP 2.24 milestone Oct 26, 2023
@kubermatic-bot kubermatic-bot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/none Denotes a PR that doesn't need documentation (changes). dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/api Denotes a PR or issue as being assigned to SIG API. do-not-merge/code-freeze Indicates that a PR should not merge because it has not been approved for code freeze yet. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 26, 2023
@kubermatic-bot kubermatic-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 Oct 26, 2023
Copy link
Contributor

@Waseem826 Waseem826 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 Oct 27, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b7b343c185d325e0f107840d3cef11a6eb08d8ee

@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2023
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 70621cb2293ee9bcb9158f13797adeb1106b6a3e

@kubermatic-bot kubermatic-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 27, 2023
@pkprzekwas
Copy link
Contributor Author

/test pre-dashboard-api-unit

@pkprzekwas
Copy link
Contributor Author

/test pre-dashboard-api-unit

1 similar comment
@pkprzekwas
Copy link
Contributor Author

/test pre-dashboard-api-unit

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 51df4f1159ad019f5887511afa894d9e7a421553

@embik
Copy link
Member

embik commented Oct 30, 2023

/cc @ahmedwaleedmalik

Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik 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
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, Waseem826

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 Oct 30, 2023
@ahmedwaleedmalik
Copy link
Member

cc @kubermatic/sig-release-managers

@embik embik added the code-freeze-approved Indicates a PR has been approved by release managers during code freeze. label Oct 30, 2023
@kubermatic-bot kubermatic-bot removed the do-not-merge/code-freeze Indicates that a PR should not merge because it has not been approved for code freeze yet. label Oct 30, 2023
@embik
Copy link
Member

embik commented Oct 30, 2023

/retest

@embik
Copy link
Member

embik commented Oct 30, 2023

/retest

🤞🏻

@pkprzekwas
Copy link
Contributor Author

/retest

@kubermatic-bot kubermatic-bot merged commit df1b0fa into kubermatic:main Oct 30, 2023
8 checks passed
@pkprzekwas
Copy link
Contributor Author

/cherrypick release/v2.23

@kubermatic-bot
Copy link
Contributor

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

Applying: Fix switch for sharing cluster
Using index info to reconstruct a base tree...
M	modules/api/go.mod
M	modules/api/go.sum
M	modules/api/pkg/api/v2/types.go
M	modules/api/pkg/handler/test/helper.go
M	modules/api/pkg/handler/v1/admin/settings.go
M	modules/api/pkg/test/e2e/utils/apiclient/models/global_settings.go
Falling back to patching base and 3-way merge...
Auto-merging modules/api/pkg/test/e2e/utils/apiclient/models/global_settings.go
Auto-merging modules/api/pkg/handler/v1/admin/settings.go
Auto-merging modules/api/pkg/handler/test/helper.go
Auto-merging modules/api/pkg/api/v2/types.go
Auto-merging modules/api/go.sum
CONFLICT (content): Merge conflict in modules/api/go.sum
Auto-merging modules/api/go.mod
CONFLICT (content): Merge conflict in modules/api/go.mod
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 switch for sharing cluster
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/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.

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. code-freeze-approved Indicates a PR has been approved by release managers during code freeze. 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/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api Denotes a PR or issue as being assigned to SIG API. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

enableShareCluster button in Kubermatic settings doesn't work
5 participants