Skip to content

Commit 3b5b325

Browse files
authored
Merge branch 'development/130.0' into improvement/ARTESCA-14994-bump-thanos-kube-prometheus-stack-2
2 parents e000012 + ce11d6e commit 3b5b325

File tree

167 files changed

+2883
-1864
lines changed

Some content is hidden

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

167 files changed

+2883
-1864
lines changed

.github/actions/bastion-tests/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
NODE: bastion
4141
COMMAND: |
4242
cd metalk8s
43-
export SSH_CONFIG_FILE=\"/home/centos/ssh_config\"
43+
export SSH_CONFIG_FILE=\"/home/rocky/ssh_config\"
4444
export ISO_MOUNTPOINT=\"${{ inputs.mountpoint || steps.metalk8s_mountpoint.outputs.mountpoint }}\"
4545
export BOOTSTRAP_BACKUP_ARCHIVE=\"${{ inputs.BOOTSTRAP_BACKUP_ARCHIVE }}\"
4646
export CONTROL_PLANE_INGRESS_VIP=\"${{ inputs.CONTROL_PLANE_INGRESS_VIP }}\"

.github/actions/bastion-ui-tests/action.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ runs:
2323
with:
2424
NODE: bastion
2525
COMMAND: |
26-
sudo yum clean all
27-
sudo yum install -y epel-release
28-
sudo yum -y update
29-
sudo yum install -y chromium
26+
sudo dnf install -y epel-release
27+
sudo dnf install -y chromium
3028
3129
- name: Run UI tests from Bastion
3230
uses: ./.github/actions/run-command-ssh

.github/actions/destroy-cluster/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ inputs:
1717
TERRAFORM_VERSION:
1818
description: "Terraform version to use"
1919
required: false
20-
default: "1.8.2"
20+
default: "1.11.4"
2121
TERRAFORM_SNAPSHOT_TAG:
2222
description: "Tag to checkout for the scality/terraform-snapshot repository"
2323
required: false
24-
default: "0.17.0"
24+
default: "0.18.0"
2525

2626
# Cloud configuration
2727
CLOUD:

.github/actions/prepare-bastion/action.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ inputs:
1414
runs:
1515
using: "composite"
1616
steps:
17+
- name: Install git and tox on bastion
18+
uses: ./.github/actions/run-command-ssh
19+
with:
20+
NODE: bastion
21+
COMMAND: |
22+
sudo dnf install -y git python3-pip
23+
pip3 install --user tox
1724
- name: Clone MetalK8s repository on Bastion
1825
uses: ./.github/actions/run-command-ssh
1926
with:

.github/actions/spawn-cluster/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ inputs:
1717
TERRAFORM_VERSION:
1818
description: "Terraform version to use"
1919
required: false
20-
default: "1.8.2"
20+
default: "1.11.4"
2121
TERRAFORM_SNAPSHOT_TAG:
2222
description: "Tag to checkout for the scality/terraform-snapshot repository"
2323
required: false
24-
default: "0.17.0"
24+
default: "0.18.0"
2525

2626
# Cloud configuration
2727
CLOUD:

.github/workflows/single-node-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
export DEST_DIR="artifacts/ui-e2e-tests/${{ github.job }}"
248248
mkdir -p ${DEST_DIR}
249249
scp -F ssh_config \
250-
"bastion:/home/centos/metalk8s/ui/cypress/videos/e2e/*" \
250+
"bastion:metalk8s/ui/cypress/videos/e2e/*" \
251251
"${DEST_DIR}/"
252252
253253
- name: Generate and Collect sosreport

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,22 @@
4242
[1.17.1](https://github.com/cert-manager/cert-manager/releases/tag/v1.17.1)
4343
(PR[#4579](https://github.com/scality/metalk8s/pull/4579))
4444

45+
- Bump Operator-SDK used by `metalk8s-operator` and `storage-operator` to
46+
[1.38.0](https://github.com/operator-framework/operator-sdk/releases/tag/v1.38.0)
47+
The Go version has been bumped accordingly to
48+
[1.22](https://golang.org/doc/devel/release.html#go1.22.minor)
49+
(PR[#4581](https://github.com/scality/metalk8s/pull/4581))
50+
51+
- Bump Loki chart version to
52+
[6.29.0](https://github.com/grafana/loki/releases/tag/helm-loki-6.29.0)
53+
The Loki image has been bumped accordingly to
54+
[3.4.2](https://github.com/grafana/loki/releases/tag/v3.4.2)
55+
(PR[##4562](https://github.com/scality/metalk8s/pull/#4562))
56+
57+
- Bump prometheus-adapter chart version to
58+
[4.14.1](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-4.14.1)
59+
(PR[#4563](https://github.com/scality/metalk8s/pull/4563))
60+
4561
- Bump kube-prometheus-stack chart version to
4662
[70.7.0](https://github.com/prometheus-community/helm-charts/releases/tag/kube-prometheus-stack-70.7.0)
4763
(PR[#4591](https://github.com/scality/metalk8s/pull/4591))

buildchain/buildchain/versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
268268
),
269269
Image(
270270
name="loki",
271-
version="3.2.0",
272-
digest="sha256:882e30c20683a48a8b7ca123e6c19988980b4bd13d2ff221dfcbef0fdc631694",
271+
version="3.4.2",
272+
digest="sha256:58a6c186ce78ba04d58bfe2a927eff296ba733a430df09645d56cdc158f3ba08",
273273
),
274274
Image(
275275
name="fluent-bit",

charts/loki/Chart.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
22
- name: minio
33
repository: https://charts.min.io/
4-
version: 4.1.0
4+
version: 5.4.0
55
- name: grafana-agent-operator
66
repository: https://grafana.github.io/helm-charts
7-
version: 0.5.0
7+
version: 0.5.1
88
- name: rollout-operator
99
repository: https://grafana.github.io/helm-charts
10-
version: 0.19.1
11-
digest: sha256:c5c928ea56124dd145a4d3e8b1cc478cc6ce8d002e8dafa7a7457cd096e4d6e2
12-
generated: "2024-11-15T21:25:36.196519401Z"
10+
version: 0.24.0
11+
digest: sha256:beb08aeb31a1fa6b88c326b307c9960ca5fc5032892f7acd5deae6b859884638
12+
generated: "2025-02-26T01:09:19.861074559Z"

charts/loki/Chart.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
apiVersion: v2
2-
appVersion: 3.2.0
2+
appVersion: 3.4.2
33
dependencies:
44
- alias: minio
55
condition: minio.enabled
66
name: minio
77
repository: https://charts.min.io/
8-
version: 4.1.0
8+
version: 5.4.0
99
- alias: grafana-agent-operator
1010
condition: monitoring.selfMonitoring.grafanaAgent.installOperator
1111
name: grafana-agent-operator
1212
repository: https://grafana.github.io/helm-charts
13-
version: 0.5.0
13+
version: 0.5.1
1414
- alias: rollout_operator
1515
condition: rollout_operator.enabled
1616
name: rollout-operator
1717
repository: https://grafana.github.io/helm-charts
18-
version: 0.19.1
19-
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both
20-
simple, scalable and distributed modes.
18+
version: 0.24.0
19+
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting monolithic,
20+
simple scalable, and microservices modes.
2121
home: https://grafana.github.io/helm-charts
2222
icon: https://grafana.com/docs/loki/latest/logo_and_name.png
2323
maintainers:
@@ -29,4 +29,4 @@ sources:
2929
- https://grafana.com/oss/loki/
3030
- https://grafana.com/docs/loki/latest/
3131
type: application
32-
version: 6.20.0
32+
version: 6.29.0

0 commit comments

Comments
 (0)