Skip to content

Commit bccb08c

Browse files
committed
Merge branches 'w/130.0/improvement/reduce-CVEs-metalk8s-alert-logger' and 'q/w/4524/129.0/improvement/reduce-CVEs-metalk8s-alert-logger' into tmp/octopus/q/130.0
3 parents eab8919 + 6cb1e95 + a078f51 commit bccb08c

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626

2727
### Enhancements
2828

29+
- Bump go version to
30+
[1.24](https://golang.org/doc/devel/release.html#go1.24.minor)
31+
and alertmanager go library version to
32+
[0.27.0](https://github.com/prometheus/alertmanager/releases/tag/v0.27.0)
33+
in `metalk8s-alert-logger` image
34+
(PR[#4524](https://github.com/scality/metalk8s/pull/4524))
35+
2936
- Implement super-admin user and bind admin to built-in cluster-admins role
3037
(PR[#4418](https://github.com/scality/metalk8s/pull/4418))
3138

images/metalk8s-alert-logger/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ARG BASE_IMAGE=docker.io/alpine
22

33
ARG BUILD_IMAGE_NAME=golang
4-
ARG BUILD_IMAGE_TAG=1.17.0-alpine
4+
ARG BUILD_IMAGE_TAG=1.24.0-alpine
55
FROM ${BUILD_IMAGE_NAME}:${BUILD_IMAGE_TAG} AS builder
66

77
ENV CGO_ENABLED=0
88

9-
ARG ALERTMANAGER_VERSION=v0.26.0
9+
ARG ALERTMANAGER_VERSION=v0.27.0
1010
ARG PKG_PATH=/go/src/metalk8s-alert-logger/
1111

1212
RUN mkdir -p "$PKG_PATH"
@@ -16,7 +16,7 @@ COPY main.go go.mod "$PKG_PATH"
1616
WORKDIR "$PKG_PATH"
1717

1818
RUN sed -i "s/@@ALERTMANAGER_VERSION@@/$ALERTMANAGER_VERSION/g" go.mod \
19-
&& go mod tidy -go=1.16 && go mod tidy -go=1.17 \
19+
&& go mod tidy -go=1.24 \
2020
&& go install
2121

2222
FROM ${BASE_IMAGE}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module metalk8s-alert-logger
22

3-
go 1.17
3+
go 1.24
44

55
require github.com/prometheus/alertmanager @@ALERTMANAGER_VERSION@@

0 commit comments

Comments
 (0)