Skip to content

Commit 054852c

Browse files
committed
Merge branch 'main' into feat/pod-replicas-colocated-alert
Assisted-by: LLM Signed-off-by: Aleksei Sviridkin <[email protected]>
2 parents 5632596 + 56224a1 commit 054852c

605 files changed

Lines changed: 58186 additions & 35886 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gemini/styleguide.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Similarly, never propose edits to:
3535

3636
Each commit must follow [Conventional Commits](https://www.conventionalcommits.org/) format: `type(scope): brief description`.
3737

38-
Valid types: `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `build`, `ci`, `chore`.
38+
Valid types: `feat`, `fix`, `security` (a fix that comes through a security advisory), `docs`, `style`, `refactor`, `perf`, `test`, `build`, `ci`, `chore`.
3939

4040
Valid scopes:
4141

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!-- Thank you for making a contribution! Here are some tips for you:
22
- Use Conventional Commits for the PR title: `type(scope): description`
3-
- Types: feat, fix, docs, style, refactor, perf, test, build, ci, chore
3+
- Types: feat, fix, security (a fix that comes through a security advisory), docs, style, refactor, perf, test, build, ci, chore
44
- Scopes are not an exhaustive list — pick the most specific scope for the change and extend the list when a genuinely new area appears. Examples:
55
- System components: dashboard, platform, operator, cilium, kube-ovn, linstor, fluxcd, cluster-api
66
- Managed apps: postgres, mariadb, redis, kafka, clickhouse, virtual-machine, kubernetes
77
- Development and maintenance: api, hack, tests, ci, docs, maintenance
88
- Breaking changes: append `!` after type/scope (`feat(api)!: ...`) or add a `BREAKING CHANGE:` footer
99
- If it's a work in progress, consider creating this PR as a draft.
1010
- Don't hesistate to ask for opinion and review in the community chats, even if it's still a draft.
11-
- Add the label `kind/backport` if it's a bugfix that needs to be backported to a previous version.
11+
- Fixes merged to `main` reach the release lines the backport batch runs for automatically, so do not open backport PRs by hand: https://github.com/cozystack/cozystack/blob/main/docs/release/backports.md
1212
-->
1313

1414
## What this PR does

‎.github/labels.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
# do-not-merge/ PR merge blockers
2323
# security/ security-finding severity and status (Cozystack-specific)
2424
# size/ PR size (auto-applied)
25+
# backport/ maintainer overrides of the backport batch rules (Cozystack-specific)
2526
#
2627
# `aliases:` lets EndBug/label-sync rename existing labels without losing
2728
# references on already-tagged issues and PRs.
@@ -78,18 +79,6 @@
7879
color: 'e11d21'
7980
description: Indicates the change introduces a breaking API or behaviour change
8081

81-
# kind/backport-previous has no upstream Kubernetes equivalent (k8s has no
82-
# two-release-line model); it stays under kind/ per the file convention.
83-
- name: kind/backport
84-
color: 'fbca04'
85-
description: Categorizes issue or PR as requiring a backport to the current release line
86-
aliases: ['backport']
87-
88-
- name: kind/backport-previous
89-
color: 'fbd876'
90-
description: Categorizes issue or PR as requiring a backport to the previous release line
91-
aliases: ['backport-previous']
92-
9382
# ──────────────────────────────────────────────
9483
# priority/ — urgency
9584
# ──────────────────────────────────────────────
@@ -411,3 +400,17 @@
411400
- name: security/fixed
412401
color: '0e8a16'
413402
description: Fix released
403+
404+
# ──────────────────────────────────────────────
405+
# backport/ — maintainer overrides of the backport batch rules
406+
# ──────────────────────────────────────────────
407+
408+
# Read by cmd/backport-batch from the merged pull request on main;
409+
# docs/release/backports.md describes both.
410+
- name: backport/include
411+
color: 'c2e0c6'
412+
description: The backport batch takes this PR though rules 2-4 keep it out; it must still pick and pass CI
413+
414+
- name: backport/skip
415+
color: 'f9d0c4'
416+
description: The backport batch keeps this PR out although the rules take it

‎.github/renovate.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@
3232
"matchStrings": ["clastix/kubectl:(?<currentValue>v[0-9]+\\.[0-9]+(?:\\.[0-9]+)?)@(?<currentDigest>sha256:[a-f0-9]+)"],
3333
"datasourceTemplate": "docker",
3434
"depNameTemplate": "docker.io/clastix/kubectl"
35+
},
36+
{
37+
"customType": "regex",
38+
"description": "Track the BuildKit SBOM scanner pinned by tag and digest in hack/common-envs.mk. The dockerfile manager does not read Makefiles and the helm-values manager is disabled repo-wide (see enabledManagers above), so without this manager the pin would stay on the syft it was cut with: the floating stable-1 tag it replaced moved to a fixed syft on its own, a digest pin does not. Tag and digest move together here, as the comment above the pin asks.",
39+
"managerFilePatterns": ["/^hack/common-envs\\.mk$/"],
40+
"matchStrings": ["SBOM_SCANNER \\?= (?<depName>docker\\.io/docker/buildkit-syft-scanner):(?<currentValue>[0-9]+\\.[0-9]+\\.[0-9]+)@(?<currentDigest>sha256:[a-f0-9]+)"],
41+
"datasourceTemplate": "docker"
3542
}
3643
],
3744
"packageRules": [

0 commit comments

Comments
 (0)