Skip to content

Commit 6cc3ee9

Browse files
Merge remote-tracking branch 'origin/development/133.0' into HEAD
2 parents bfd32fe + fa71615 commit 6cc3ee9

Some content is hidden

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

49 files changed

+302
-1083
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
uses: actions/checkout@v6
138138
- name: Upload final status
139139
if: always()
140-
uses: scality/actions/upload_final_status@1.15.0
140+
uses: scality/actions/upload_final_status@1.17.0
141141
with:
142142
ARTIFACTS_USER: ${{ secrets.ARTIFACTS_USER }}
143143
ARTIFACTS_PASSWORD: ${{ secrets.ARTIFACTS_PASSWORD }}

.github/workflows/cron-clean-ovh-cloud.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Clean up old VMs in OpenStack
14-
uses: scality/actions/actions-cleanup-openstack-vms@1.15.0
14+
uses: scality/actions/actions-cleanup-openstack-vms@1.17.0
1515
with:
1616
AUTH_URL: ${{ secrets.OVH_AUTH_URL }}
1717
AGE_HOURS: 6

.github/workflows/crons.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
access_token: ${{ secrets.GITHUB_TOKEN }}
9191
- name: Notify Slack on retry triggered
9292
if: matrix.type == 'retry' && steps.retry.outputs.was-retried == 'true'
93-
uses: slackapi/slack-github-action@v1
93+
uses: slackapi/slack-github-action@v3
9494
with:
9595
channel-id: "#squad-metalk8s"
9696
slack-message: |
@@ -104,7 +104,7 @@ jobs:
104104
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
105105
- name: Notify Slack on manual action needed
106106
if: matrix.type == 'retry' && steps.retry.outputs.retry-count != '' && fromJSON(steps.retry.outputs.retry-count) >= fromJSON(env.MAX_RETRIES)
107-
uses: slackapi/slack-github-action@v1
107+
uses: slackapi/slack-github-action@v3
108108
with:
109109
channel-id: "#squad-metalk8s"
110110
slack-message: |

.github/workflows/lifecycle-dev.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ jobs:
5858
needs:
5959
- get-dev-artifacts-url
6060
uses: ./.github/workflows/downgrade-test.yaml
61+
# NOTE: Downgrade is not supported from 133 to 132 (see CHANGELOG.md)
62+
# Should be removed in `development/134.0`
63+
if: ${{ ! startsWith(inputs.dev-branch, 'development/132') }}
6164
secrets: inherit
6265
with:
6366
from-artifacts-url: ${{ inputs.artifacts-url }}

.github/workflows/lifecycle-promoted.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@ jobs:
208208

209209
promoted-downgrade:
210210
uses: ./.github/workflows/downgrade-test.yaml
211+
# NOTE: Downgrade is not supported from 133 to 132 (see CHANGELOG.md)
212+
# Should be removed in `development/134.0`
213+
if: ${{ ! startsWith(inputs.promoted-version, '132.') }}
211214
secrets: inherit
212215
with:
213216
from-artifacts-url: ${{ inputs.artifacts-url }}

.github/workflows/nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
uses: actions/checkout@v6
245245
- name: Upload final status
246246
if: always()
247-
uses: scality/actions/upload_final_status@1.15.0
247+
uses: scality/actions/upload_final_status@1.17.0
248248
with:
249249
ARTIFACTS_USER: ${{ secrets.ARTIFACTS_USER }}
250250
ARTIFACTS_PASSWORD: ${{ secrets.ARTIFACTS_PASSWORD }}

.github/workflows/pre-merge.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
node-version: "20"
159159
- name: Cache node modules
160160
id: cache-npm
161-
uses: actions/cache@v4
161+
uses: actions/cache@v5
162162
env:
163163
cache-name: cache-node-modules
164164
with:
@@ -201,7 +201,7 @@ jobs:
201201
node-version: "20"
202202
- name: Cache node modules
203203
id: cache-npm
204-
uses: actions/cache@v4
204+
uses: actions/cache@v5
205205
env:
206206
cache-name: cache-node-modules
207207
with:
@@ -236,7 +236,7 @@ jobs:
236236
with:
237237
node-version: "20"
238238
- name: Cache node modules
239-
uses: actions/cache@v4
239+
uses: actions/cache@v5
240240
env:
241241
cache-name: cache-node-modules
242242
with:
@@ -377,7 +377,7 @@ jobs:
377377
node-version: "20"
378378
- name: Cache node modules
379379
id: cache-npm
380-
uses: actions/cache@v4
380+
uses: actions/cache@v5
381381
env:
382382
cache-name: cache-node-modules
383383
with:
@@ -456,7 +456,7 @@ jobs:
456456
node-version: "20"
457457
- name: Cache node modules
458458
id: cache-npm
459-
uses: actions/cache@v4
459+
uses: actions/cache@v5
460460
env:
461461
cache-name: cache-node-modules
462462
with:
@@ -535,7 +535,7 @@ jobs:
535535
uses: actions/checkout@v6
536536
- name: Upload final status
537537
if: always()
538-
uses: scality/actions/upload_final_status@1.15.0
538+
uses: scality/actions/upload_final_status@1.17.0
539539
with:
540540
ARTIFACTS_USER: ${{ secrets.ARTIFACTS_USER }}
541541
ARTIFACTS_PASSWORD: ${{ secrets.ARTIFACTS_PASSWORD }}

.pylint-dict

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ scality
7878
sdk
7979
skopeo
8080
sls
81+
sosreport
8182
srv
8283
Thanos
8384
timestamp

BUMPING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ This guide is applied for both `metalk8s-operator` and `storage-operator`.
148148

149149
## Containerd
150150

151-
Instructions to bump Containerd version are in its [spec file](./packages/redhat/common/containerd.spec)
151+
The version just needs to be updated in `buildchain/buildchain/versions.py`.
152152

153153
## Update the sls state
154154

CHANGELOG.md

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@
22

33
## Release 133.0.0 (in development)
44

5+
### Breaking changes
6+
7+
- Due to the migration from our own RPM for containerd v1 to the official
8+
containerd.io RPM from docker.io, downgrading from 133 to 132 will not be
9+
possible.
10+
511
### Enhancements
612

713
- Bump Kubernetes version to [1.33.7](https://github.com/kubernetes/kubernetes/releases/tag/v1.33.7)
814
(PR[#4769](https://github.com/scality/metalk8s/pull/4769))
915

16+
- Move from our own RPM for containerd v1 to the official containerd.io RPM from docker.io
17+
to version [v2.2.2](https://github.com/containerd/containerd/releases/tag/v2.2.2)
18+
(PR[#4821](https://github.com/scality/metalk8s/pull/4821))
19+
1020
- Bump etcd version to [3.5.26](https://github.com/etcd-io/etcd/releases/tag/v3.5.26)
1121
(PR[#4769](https://github.com/scality/metalk8s/pull/4769))
1222

@@ -16,9 +26,9 @@
1626
- Support etcd distroless images for Kubernetes 1.33+. Above etcd 3.5.21, etcd images are now distroless and upstreamed to the etcd project.
1727
(PR[#4740](https://github.com/scality/metalk8s/pull/4740))
1828

19-
- Bump Fluent Bit image version to [4.2.2](https://github.com/fluent/fluent-bit/releases/tag/v4.2.2)
20-
and Fluent Bit Helm chart version to [0.55.0](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.55.0)
21-
(PR[#4778](https://github.com/scality/metalk8s/pull/4778))
29+
- Bump Fluent Bit image version to [4.2.3](https://github.com/fluent/fluent-bit/releases/tag/v4.2.3)
30+
and Fluent Bit Helm chart version to [0.56.0](https://github.com/fluent/helm-charts/releases/tag/fluent-bit-0.56.0)
31+
(PR[#4812](https://github.com/scality/metalk8s/pull/4812))
2232

2333
- Bump dex chart version to
2434
[0.24.0](https://github.com/dexidp/helm-charts/releases/tag/dex-0.24.0)
@@ -30,12 +40,19 @@
3040
and Loki image version to [3.6.5](https://github.com/grafana/loki/releases/tag/v3.6.5)
3141
(PR[#4792](https://github.com/scality/metalk8s/pull/4792))
3242

43+
- Configure containerd using `config_path` for registries so that changes of
44+
registries mirrors does no longer require a restart of the containerd service
45+
(PR[#4821](https://github.com/scality/metalk8s/pull/4821))
46+
3347
- Allow to enable metrics collection for the solutions operators
3448
(PR[#4813](https://github.com/scality/metalk8s/pull/4813))
3549

3650
- Bump solution-operator-lib Go version to 1.24
3751
(PR[#4817](https://github.com/scality/metalk8s/pull/4817))
3852

53+
- Bump prometheus-adapter chart version to [5.3.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-5.3.0)
54+
(PR[#4825](https://github.com/scality/metalk8s/pull/4825))
55+
3956
- Bump ingress-nginx chart version to [4.15.0](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.15.0)
4057
and ingress-nginx controller to [v1.15.0](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.15.0)
4158
(PR[#4824](https://github.com/scality/metalk8s/pull/4824))
@@ -47,6 +64,9 @@
4764
and `k8s.io/*` dependencies have been bumped to [0.33.9](https://github.com/kubernetes/kubernetes/releases/tag/v1.33.9)
4865
(PR[#4818](https://github.com/scality/metalk8s/pull/4818))
4966

67+
- Implement ability to add certificates to fluent-bit by mounting a fluent-bit-certs secret
68+
(PR[#4812](https://github.com/scality/metalk8s/pull/4812))
69+
5070
### Bug Fixes
5171

5272
- Fix a bug where part of the upgrade process would silently be skipped
@@ -55,6 +75,12 @@
5575

5676
## Release 132.0.3 (in development)
5777

78+
### Bug Fixes
79+
80+
- Fix a bug where Salt master process may report an error about `VerboseLogger`
81+
not having attributes `trace`
82+
(PR[#4831](https://github.com/scality/metalk8s/pull/4831))
83+
5884
## Release 132.0.2
5985

6086
## Release 132.0.1

0 commit comments

Comments
 (0)