Skip to content

Commit 3b5b325

Browse files
vdaviotvdaviot
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

‎charts/loki/Makefile

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,84 @@
11
.DEFAULT_GOAL := all
2-
.PHONY: lint lint-yaml
2+
.PHONY: lint lint-yaml install-distributed install-single-binary uninstall update-chart update
3+
4+
# Optional image override, example: make install-distributed IMAGE=grafana/loki:2.9.0
5+
IMAGE ?=
6+
7+
# Optional helm arguments, example: make install-distributed ARGS="--set loki.auth.enabled=true"
8+
ARGS ?=
9+
10+
# Default arguments to disable affinity for testing
11+
DEFAULT_ARGS = --set gateway.affinity=null \
12+
--set ingester.affinity=null \
13+
--set distributor.affinity=null \
14+
--set querier.affinity=null \
15+
--set queryFrontend.affinity=null \
16+
--set queryScheduler.affinity=null \
17+
--set indexGateway.affinity=null \
18+
--set compactor.affinity=null \
19+
--set ruler.affinity=null \
20+
--set backend.affinity=null \
21+
--set read.affinity=null \
22+
--set write.affinity=null \
23+
--set singleBinary.affinity=null \
24+
--set memcachedChunks.affinity=null \
25+
--set memcachedFrontend.affinity=null \
26+
--set memcachedIndexQueries.affinity=null \
27+
--set memcachedMetadata.affinity=null \
28+
--set memcachedResults.affinity=null \
29+
--set global.podAntiAffinity=null \
30+
--set global.podAntiAffinityTopologyKey=null
31+
32+
# Generate image override flag if IMAGE is provided
33+
IMAGE_FLAG = $(if $(IMAGE),\
34+
$(eval PARTS=$(subst :, ,$(IMAGE)))\
35+
$(eval REPO_PARTS=$(subst /, ,$(word 1,$(PARTS))))\
36+
$(eval TAG=$(word 2,$(PARTS)))\
37+
$(eval REPO_COUNT=$(words $(REPO_PARTS)))\
38+
$(if $(filter 3,$(REPO_COUNT)),\
39+
--set loki.image.registry=$(word 1,$(REPO_PARTS))/$(word 2,$(REPO_PARTS)) --set loki.image.repository=$(word 3,$(REPO_PARTS)),\
40+
--set loki.image.registry=$(word 1,$(REPO_PARTS)) --set loki.image.repository=$(word 2,$(REPO_PARTS))\
41+
) --set loki.image.tag=$(TAG),)
342

443
lint: lint-yaml
544

645
lint-yaml:
746
yamllint -c $(CURDIR)/src/.yamllint.yaml $(CURDIR)/src
47+
48+
# Helm chart installation targets
49+
install-distributed:
50+
helm upgrade --install loki . \
51+
-f distributed-values.yaml \
52+
--create-namespace \
53+
--namespace loki \
54+
$(DEFAULT_ARGS) \
55+
$(IMAGE_FLAG) \
56+
$(ARGS)
57+
58+
install-single-binary:
59+
helm upgrade --install loki . \
60+
-f single-binary-values.yaml \
61+
--create-namespace \
62+
--namespace loki \
63+
$(DEFAULT_ARGS) \
64+
$(IMAGE_FLAG) \
65+
$(ARGS)
66+
67+
# Uninstall Loki helm release and optionally delete the namespace
68+
uninstall:
69+
helm uninstall loki --namespace loki
70+
kubectl delete namespace loki --ignore-not-found
71+
72+
# Update Helm chart dependencies
73+
update-chart:
74+
helm dependency update .
75+
76+
# Update existing installation with latest changes
77+
update:
78+
@if [ "$$(helm get values loki -n loki -o yaml | grep "deploymentMode: Distributed")" ]; then \
79+
echo "Updating distributed deployment..."; \
80+
helm upgrade loki . -f distributed-values.yaml --namespace loki $(DEFAULT_ARGS) $(IMAGE_FLAG) $(ARGS); \
81+
else \
82+
echo "Updating single binary deployment..."; \
83+
helm upgrade loki . -f single-binary-values.yaml --namespace loki $(DEFAULT_ARGS) $(IMAGE_FLAG) $(ARGS); \
84+
fi

‎charts/loki/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# loki
22

3-
![Version: 6.20.0](https://img.shields.io/badge/Version-6.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.0](https://img.shields.io/badge/AppVersion-3.2.0-informational?style=flat-square)
3+
![Version: 6.29.0](https://img.shields.io/badge/Version-6.29.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.4.2](https://img.shields.io/badge/AppVersion-3.4.2-informational?style=flat-square)
44

5-
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
5+
Helm chart for Grafana Loki and Grafana Enterprise Logs supporting monolithic, simple scalable, and microservices modes.
66

77
## Source Code
88

@@ -14,9 +14,9 @@ Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple,
1414

1515
| Repository | Name | Version |
1616
|------------|------|---------|
17-
| https://charts.min.io/ | minio(minio) | 4.1.0 |
18-
| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.0 |
19-
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.19.1 |
17+
| https://charts.min.io/ | minio(minio) | 5.4.0 |
18+
| https://grafana.github.io/helm-charts | grafana-agent-operator(grafana-agent-operator) | 0.5.1 |
19+
| https://grafana.github.io/helm-charts | rollout_operator(rollout-operator) | 0.24.0 |
2020

2121
Find more information in the Loki Helm Chart [documentation](https://grafana.com/docs/loki/next/installation/helm).
2222

‎charts/loki/charts/grafana-agent-operator/Chart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v2
2-
appVersion: 0.43.3
2+
appVersion: 0.44.2
33
description: A Helm chart for Grafana Agent Operator
4-
home: https://grafana.com/docs/agent/v0.43/
5-
icon: https://raw.githubusercontent.com/grafana/agent/v0.43.3/docs/sources/assets/logo_and_name.png
4+
home: https://grafana.com/docs/agent/v0.44/
5+
icon: https://raw.githubusercontent.com/grafana/agent/v0.44.2/docs/sources/assets/logo_and_name.png
66
maintainers:
77
- email: [email protected]
88
name: Grafana Agent Team
99
name: grafana-agent-operator
1010
sources:
11-
- https://github.com/grafana/agent/tree/v0.43.3/static/operator
11+
- https://github.com/grafana/agent/tree/v0.44.2/static/operator
1212
type: application
13-
version: 0.5.0
13+
version: 0.5.1

‎charts/loki/charts/grafana-agent-operator/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# grafana-agent-operator
22

3-
![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.43.3](https://img.shields.io/badge/AppVersion-0.43.3-informational?style=flat-square)
3+
![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.44.2](https://img.shields.io/badge/AppVersion-0.44.2-informational?style=flat-square)
44

55
A Helm chart for Grafana Agent Operator
66

77
⚠️ **Please create issues relating to this Helm chart in the [Agent](https://github.com/grafana/agent/issues) repo.**
88

99
## Source Code
1010

11-
* <https://github.com/grafana/agent/tree/v0.43.3/static/operator>
11+
* <https://github.com/grafana/agent/tree/v0.44.2/static/operator>
1212

1313
Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources.
1414

@@ -64,7 +64,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
6464
| image.pullSecrets | list | `[]` | Image pull secrets |
6565
| image.registry | string | `"docker.io"` | Image registry |
6666
| image.repository | string | `"grafana/agent-operator"` | Image repo |
67-
| image.tag | string | `"v0.43.3"` | Image tag |
67+
| image.tag | string | `"v0.44.2"` | Image tag |
6868
| kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets |
6969
| nameOverride | string | `""` | Overrides the chart's name |
7070
| nodeSelector | object | `{}` | nodeSelector configuration |

‎charts/loki/charts/grafana-agent-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ image:
4141
# -- Image repo
4242
repository: grafana/agent-operator
4343
# -- Image tag
44-
tag: v0.43.3
44+
tag: v0.44.2
4545
# -- Image pull policy
4646
pullPolicy: IfNotPresent
4747
# -- Image pull secrets

‎charts/loki/charts/minio/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
2-
appVersion: RELEASE.2022-10-24T18-35-07Z
3-
description: Multi-Cloud Object Storage
2+
appVersion: RELEASE.2024-12-18T13-15-44Z
3+
description: High Performance Object Storage
44
home: https://min.io
55
icon: https://min.io/resources/img/logo/MINIO_wordmark.png
66
keywords:
@@ -15,4 +15,4 @@ maintainers:
1515
name: minio
1616
sources:
1717
- https://github.com/minio/minio
18-
version: 4.1.0
18+
version: 5.4.0

0 commit comments

Comments
 (0)