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

Switch from in-tree mermaid client to out-of-tree manager client #1702

Merged
merged 3 commits into from
Jan 26, 2024
Merged

Switch from in-tree mermaid client to out-of-tree manager client #1702

merged 3 commits into from
Jan 26, 2024

Conversation

rzetelskik
Copy link
Member

Description of your changes:
The manager client needs to be updated, as the current one is missing restore-related methods. The restore-related methods are required for #1671.
Instead of updating the in-tree mermaid client, this PR removes the in-tree dependency and switches to out-of-tree manager client vendored from Scylla Manager repository.

Which issue is resolved by this Pull Request:
Resolves #1701

/priority important-soon
/kind feature
/area dependency
/cc

@scylla-operator-bot scylla-operator-bot
Copy link
Contributor

@rzetelskik: GitHub didn't allow me to request PR reviews from the following users: rzetelskik.

Note that only scylladb members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

Description of your changes:
The manager client needs to be updated, as the current one is missing restore-related methods. The restore-related methods are required for #1671.
Instead of updating the in-tree mermaid client, this PR removes the in-tree dependency and switches to out-of-tree manager client vendored from Scylla Manager repository.

Which issue is resolved by this Pull Request:
Resolves #1701

/priority important-soon
/kind feature
/area dependency
/cc

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.

@scylla-operator-bot scylla-operator-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/feature Categorizes issue or PR as related to a new feature. area/dependency Issues or PRs related to dependency changes size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 24, 2024
@rzetelskik rzetelskik changed the title [WIP] Switch from in-tree mermaid client to out-of-tree manager client Switch from in-tree mermaid client to out-of-tree manager client Jan 24, 2024
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 24, 2024
@rzetelskik
Copy link
Member Author

https://prow.scylla-operator.scylladb.com/view/gs/scylla-operator-prow/pr-logs/pull/scylladb_scylla-operator/1702/pull-scylla-operator-master-e2e-gke-parallel-clusterip/1750114355044683777#1:test-build-log.txt%3A1351

  [FAILED] Expected
      <[]*models.TaskListItem | len:0, cap:0>: nil
  to have length 1
  In [It] at: github.com/scylladb/scylla-operator/test/e2e/set/scyllacluster/scyllamanager.go:99 @ 01/24/24 11:36:39.531
  Full Stack Trace
    github.com/scylladb/scylla-operator/test/e2e/set/scyllacluster.glob..func18.1()
    	github.com/scylladb/scylla-operator/test/e2e/set/scyllacluster/scyllamanager.go:99 +0xcf6

Looking into what caused this

@rzetelskik
Copy link
Member Author

rzetelskik commented Jan 24, 2024 •
edited
Loading

/retest
I wasn't able to hit any issues locally.

@rzetelskik
Copy link
Member Author

bricked CI
/test e2e-gke-parallel

@rzetelskik
Copy link
Member Author

/test e2e-gke-parallel

@rzetelskik rzetelskik changed the title Switch from in-tree mermaid client to out-of-tree manager client [WIP] Switch from in-tree mermaid client to out-of-tree manager client Jan 25, 2024
@scylla-operator-bot scylla-operator-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 25, 2024
@rzetelskik
Copy link
Member Author

#1478 (comment)
/retest

@rzetelskik
Copy link
Member Author

rzetelskik commented Jan 25, 2024 •
edited
Loading

The issue was caused by me initially missing the nowSafety buffer. This is outdated and somewhat broken, but I'll address it separately. This PR is keeping it as it's only supposed to migrate the client out of tree and update it.

@rzetelskik rzetelskik changed the title [WIP] Switch from in-tree mermaid client to out-of-tree manager client Switch from in-tree mermaid client to out-of-tree manager client Jan 25, 2024
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 25, 2024
zimnx
zimnx approved these changes Jan 26, 2024
View reviewed changes
Copy link
Collaborator

@zimnx zimnx left a comment

Choose a reason for hiding this comment

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

/approve
/assign tnozicka

pkg/controller/manager/types_old.go Show resolved Hide resolved
pkg/controller/manager/sync_action.go Show resolved Hide resolved
@scylla-operator-bot scylla-operator-bot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 26, 2024
tnozicka
tnozicka approved these changes Jan 26, 2024
View reviewed changes
Copy link
Member

@tnozicka tnozicka left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm
thanks

@scylla-operator-bot scylla-operator-bot bot added the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2024
@scylla-operator-bot scylla-operator-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rzetelskik, tnozicka, zimnx

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

@scylla-operator-bot scylla-operator-bot bot merged commit 4a7ef27 into scylladb:master Jan 26, 2024
12 checks passed
@rzetelskik rzetelskik deleted the manager-client-switch branch January 26, 2024 09:40
@rzetelskik rzetelskik mentioned this pull request Mar 11, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zimnx zimnx zimnx approved these changes

@tnozicka tnozicka tnozicka approved these changes

Assignees

@tnozicka tnozicka

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Manager client needs to be updated
3 participants
@rzetelskik @zimnx @tnozicka