Skip to content

[backport] Backport several patches to 0.30.x - #852

Merged
Nick Volynkin (NickVolynkin) merged 5 commits into
release-0.30from
release-0.30-backports
Apr 23, 2025
Merged

[backport] Backport several patches to 0.30.x#852
Nick Volynkin (NickVolynkin) merged 5 commits into
release-0.30from
release-0.30-backports

Conversation

@NickVolynkin

@NickVolynkin Nick Volynkin (NickVolynkin) commented Apr 23, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Cherry-picking patches that came before #841
was merged.

  • Used git cherry-pick -x -m1 <sha1> on merge commits of respective pull requests.
  • Added Co-authored-by where the author of the changes was not the one who merged the PR (and authored the merge commit).

@coderabbitai

coderabbitai Bot commented Apr 23, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@NickVolynkin Nick Volynkin (NickVolynkin) mentioned this pull request Apr 23, 2025
Merged
@NickVolynkin
Nick Volynkin (NickVolynkin) force-pushed the release-0.30-backports branch 2 times, most recently from eefe7b9 to 96a4cb0 Compare April 23, 2025 09:46
This was referenced Apr 23, 2025
Merged
Merged
@NickVolynkin Nick Volynkin (NickVolynkin) changed the title [monitoring] Drop legacy label condition. (#826) [backport] Backport several patches to 0.30.x Apr 23, 2025
@NickVolynkin

Nick Volynkin (NickVolynkin) commented Apr 23, 2025

Copy link
Copy Markdown
Contributor Author 
Commit sha: [ed078da](https://github.com/cozystack/cozystack/pull/852/commits/ed078da9af4f3ed2925ef4b2493224706431d4b3), Author: Andrei Kvapil, Committer: Nick Volynkin; Expected "Andrei Kvapil [[email protected]](mailto:[email protected])", but got "kklinch0 [[email protected]](mailto:[email protected])".
Commit sha: [5b801a6](https://github.com/cozystack/cozystack/pull/852/commits/5b801a6fb78971ed011a681dc9e2f949e5d9eb70), Author: klinch0, Committer: Nick Volynkin; Expected "klinch0 [[email protected]](mailto:[email protected])", but got "Andrei Kvapil [[email protected]](mailto:[email protected])".
Commit sha: [96a4cb0](https://github.com/cozystack/cozystack/pull/852/commits/96a4cb0f9dcad4bccaa302e01bf7dffa36c7bf5c), Author: klinch0, Committer: Nick Volynkin; Expected "klinch0 [[email protected]](mailto:[email protected])", but got "kklinch0 [[email protected]](mailto:[email protected])".

@NickVolynkin
Nick Volynkin (NickVolynkin) force-pushed the release-0.30-backports branch 4 times, most recently from ab1be34 to a629dfa Compare April 23, 2025 13:38
@NickVolynkin
Nick Volynkin (NickVolynkin) marked this pull request as ready for review April 23, 2025 13:38
@NickVolynkin
Nick Volynkin (NickVolynkin) marked this pull request as draft April 23, 2025 14:00
klinch0 and others added 5 commits April 23, 2025 17:03
@klinch0 @NickVolynkin
[ci] Fix escaping for gen_versions_map.sh script (#836)
9ca2595 
Backport of #836

fixes errors like this:

```
make: Entering directory '/home/runner/work/cozystack/cozystack/packages/apps'
find . -maxdepth 2 -name Chart.yaml  | awk -F/ '{print $2}' | while read i; do sed -i "s/^name: .*/name: $i/" "$i/Chart.yaml"; done
../../hack/gen_versions_map.sh
../../hack/gen_versions_map.sh: 34: [: !=: unexpected operator
fatal: Needed a single revision
make: *** [Makefile:17: gen-versions-map] Error 128
make: Leaving directory '/home/runner/work/cozystack/cozystack/packages/apps'
```
https://github.com/cozystack/cozystack/actions/runs/14591720553/job/40928276862?pr=835

Improved reliability of version generation by handling empty or
special values safely in the process.

(cherry picked from commit 7a9a1fc)

Signed-off-by: Nick Volynkin <[email protected]>
@kvaps @NickVolynkin
[ci] Fix escaping for gen_versions_map.sh script (#842)
4a72cc4 
Backport of #842 to release-v0.30

second attept of #836

- Improved reliability of version generation by handling empty or
special values safely in the process.

(cherry picked from commit e505857)
Signed-off-by: Nick Volynkin <[email protected]>
@kvaps @NickVolynkin
[ci] Fix checkout and improve error output for gen_versions_map.sh (#845
9257dfe 
)

Backport of #845 to release-v0.30

Third attempt to fix #842 and
#836

tested in
https://github.com/cozystack/cozystack/actions/runs/14599981710/job/40955508728?pr=808

Signed-off-by: Andrei Kvapil <[email protected]>

**Chores**
- Improved GitHub Actions workflow to fetch full git history and tags
during pre-commit checks.

**Refactor**
- Updated script behavior to display error messages when version
extraction from git fails, making troubleshooting easier.

(cherry picked from commit a6b02bf)
Signed-off-by: Nick Volynkin <[email protected]>
@kvaps @xy2 @NickVolynkin
[monitoring] Drop legacy label condition. (#826)
b70df68 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Co-authored-by: Denis Seleznev <[email protected]>
Signed-off-by: Nick Volynkin <[email protected]>
@klinch0 @kvaps @NickVolynkin
[kubernetes] Fix tenant addons removal (#835)
6f3aa9a 
Backport of #835

**New Features**
- Expanded the pre-delete operation to target additional components,
including cert-manager and vertical pod autoscaler resources.

**Chores**
- Updated chart version to 0.18.1 and revised version mappings for
improved tracking.

(cherry picked from commit ccedcb7)

Co-authored-by: Andrei Kvapil <[email protected]>
Signed-off-by: Nick Volynkin <[email protected]>
@NickVolynkin
Nick Volynkin (NickVolynkin) marked this pull request as ready for review April 23, 2025 14:06
@NickVolynkin
Nick Volynkin (NickVolynkin) merged commit 05729eb into release-0.30 Apr 23, 2025
@NickVolynkin
Nick Volynkin (NickVolynkin) deleted the release-0.30-backports branch April 23, 2025 14:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kvaps Andrei Kvapil (kvaps) Awaiting requested review from kvaps kvaps is a code owner
@lllamnyp Timofei Larkin (lllamnyp) Awaiting requested review from lllamnyp lllamnyp is a code owner

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

@NickVolynkin @klinch0 @kvaps