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

Add Cyclops #1099

Merged
merged 4 commits into from
Jan 16, 2025
Merged

Add Cyclops #1099

merged 4 commits into from
Jan 16, 2025

Conversation

petar-cvit
Copy link
Contributor

Adds Cyclops chart

@petar-cvit petar-cvit requested a review from a team as a code owner January 14, 2025 23:32
troytop
troytop previously approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@troytop troytop left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Hold off merging till we get the listing in the Partner Certification & Solutions Catalog, which should be soon. It also looks like a conflict in index.yaml needs to be resolved. @adamkpickering is this a timing thing with partner-charts-ci (automated updates running while the PR is being created)?

@adamkpickering
Copy link
Collaborator

adamkpickering commented Jan 16, 2025 •
edited
Loading

is this a timing thing with partner-charts-ci (automated updates running while the PR is being created)?

Yes it is. The generated: ... line of index.yaml gets changed with every update, so PRs that were created before an update will have a merge conflict. It's definitely annoying. It can be avoided by not committing the change to this line. Or a rebase will do it, as long as we merge the PR before another update runs.

@petar-cvit @adamkpickering
add cyclops chart
08269c8 
Signed-off-by: petar-cvit <[email protected]>
@petar-cvit @adamkpickering
add readme to Cyclops package
dcb84cd 
Signed-off-by: petar-cvit <[email protected]>
@petar-cvit @adamkpickering
add Cyclops readme
d60afaf 
Signed-off-by: petar-cvit <[email protected]>
@petar-cvit @adamkpickering
remove Cyclops 0.14.1
64e405c 
Signed-off-by: petar-cvit <[email protected]>
@troytop troytop self-requested a review January 16, 2025 21:33
troytop
troytop approved these changes Jan 16, 2025
View reviewed changes
Copy link
Contributor

@troytop troytop left a comment

Choose a reason for hiding this comment

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

With the conflict resolved, this should be good to go.

@adamkpickering adamkpickering merged commit 9ebac8d into rancher:main-source Jan 16, 2025
1 check passed
@troytop
Copy link
Contributor

troytop commented Jan 16, 2025

Screenshot 2025-01-16 at 3 49 55 PM

@petar-cvit
Copy link
Contributor Author

Awesome! Thanks both ❤️

@petar-cvit petar-cvit deleted the add-cyclops-chart branch January 20, 2025 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@troytop troytop troytop approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@petar-cvit @adamkpickering @troytop