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

Don't return error in case one of a seed down #6374

Conversation

ahmadhamzh
Copy link
Contributor

@ahmadhamzh ahmadhamzh commented Nov 10, 2023

What this PR does / why we need it:
in case of error come when fetching clusters from seed don't return the error and keep fetching clusters from other seeds

image

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

What type of PR is this?
/kind bug

Fix issue with managing clusters if some seeds are down. 
NONE

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. 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 Nov 10, 2023
@ahmadhamzh
Copy link
Contributor Author

/retest

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@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 Nov 14, 2023
@ahmedwaleedmalik ahmedwaleedmalik added this to the KKP 2.24 milestone Nov 14, 2023
@ahmedwaleedmalik
Copy link
Member

/retest

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@kubermatic-bot kubermatic-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 Nov 14, 2023
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik force-pushed the 6056-manage-clusters-on-healthy-seed-if-seed-down branch from 881dd10 to b0dd878 Compare November 14, 2023 09:28
@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2023
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 kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2023
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 823312ad102b526a697a0f62b306a334669120f7

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik

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

@ahmedwaleedmalik
Copy link
Member

/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.

@ahmedwaleedmalik
Copy link
Member

/cherry-pick release/v2.22

@kubermatic-bot
Copy link
Contributor

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

In response to this:

/cherry-pick release/v2.22

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.

@Waseem826 Waseem826 added the code-freeze-approved Indicates a PR has been approved by release managers during code freeze. label Nov 14, 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 Nov 14, 2023
@kubermatic-bot kubermatic-bot merged commit b2afe5d into kubermatic:main Nov 14, 2023
14 checks passed
@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: new pull request created: #6381

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

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

Applying: don't return error in case of seed down
Using index info to reconstruct a base tree...
M	modules/api/pkg/handler/v1/project/project.go
M	modules/api/pkg/handler/v2/cluster/cluster.go
M	modules/web/src/app/core/services/cluster.ts
Falling back to patching base and 3-way merge...
Auto-merging modules/web/src/app/core/services/cluster.ts
Auto-merging modules/api/pkg/handler/v2/cluster/cluster.go
CONFLICT (content): Merge conflict in modules/api/pkg/handler/v2/cluster/cluster.go
Auto-merging modules/api/pkg/handler/v1/project/project.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 don't return error in case of seed down
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.22

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

/cherry-pick release/v2.22

Backport for 2.22 is not required anyways.

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't manage clusters if Seed is down
4 participants