Merge pull request #1141 from cybozu/update-vm-related-container

Upgrade VictoriaMetrics related container
cybozu · Nov 10, 2023 · bafc7f9 · bafc7f9
2 parents 970af69 + 51336b3
commit bafc7f9
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 146 deletions.
diff --git a/alertmanager/.dockerignore b/alertmanager/.dockerignore
@@ -1,2 +1 @@
 *
-!*.patch
diff --git a/alertmanager/3354.patch b/alertmanager/3354.patch
diff --git a/alertmanager/BRANCH b/alertmanager/BRANCH
@@ -1 +1 @@
-0.25
+0.26
diff --git a/alertmanager/Dockerfile b/alertmanager/Dockerfile
@@ -1,21 +1,18 @@
 # Alertmanager container
 
 # Stage1: build from source
-FROM quay.io/cybozu/golang:1.20-jammy AS build
+FROM quay.io/cybozu/golang:1.21-jammy AS build
 
-ARG ALERTMANAGER_VERSION=0.25.0
+ARG ALERTMANAGER_VERSION=0.26.0
 
 # Workaround https://github.com/ksonnet/ksonnet/issues/298#issuecomment-360531855
 ENV USER=root
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-COPY /*.patch /tmp/
-
 WORKDIR /go/src/github.com/prometheus/alertmanager
 RUN curl -fsSL -o alertmanager.tar.gz "https://github.com/prometheus/alertmanager/archive/v${ALERTMANAGER_VERSION}.tar.gz" \
     && tar -x -z --strip-components 1 -f alertmanager.tar.gz \
     && rm -f alertmanager.tar.gz \
-    && patch -p1 < /tmp/3354.patch \
     && make "PREFIX=$GOPATH/bin/alertmanager" build
 
 # Stage2: setup runtime container

diff --git a/alertmanager/TAG b/alertmanager/TAG
@@ -1 +1 @@
-0.25.0.2
+0.26.0.1
diff --git a/configmap-reload/BRANCH b/configmap-reload/BRANCH
@@ -1 +1 @@
-0.11
+0.12
diff --git a/configmap-reload/Dockerfile b/configmap-reload/Dockerfile
@@ -1,9 +1,9 @@
 # configmap-reload container
 
 # Stage1: build from source
-FROM quay.io/cybozu/golang:1.20-jammy AS build
+FROM quay.io/cybozu/golang:1.21-jammy AS build
 
-ARG CONFIGMAP_RELOAD_VERSION=0.11.1
+ARG CONFIGMAP_RELOAD_VERSION=0.12.0
 
 # Workaround https://github.com/ksonnet/ksonnet/issues/298#issuecomment-360531855
 ENV USER=root

diff --git a/configmap-reload/TAG b/configmap-reload/TAG
@@ -1 +1 @@
-0.11.1.1
+0.12.0.1
diff --git a/prometheus-config-reloader/BRANCH b/prometheus-config-reloader/BRANCH
@@ -1 +1 @@
-0.66
+0.69
diff --git a/prometheus-config-reloader/Dockerfile b/prometheus-config-reloader/Dockerfile
@@ -1,9 +1,9 @@
 # prometheus-config-reloader container
 
 # Stage1: build from source
-FROM quay.io/cybozu/golang:1.20-jammy AS build
+FROM quay.io/cybozu/golang:1.21-jammy AS build
 
-ARG PROMETHEUS_OPERATOR_VERSION=0.66.0
+ARG PROMETHEUS_OPERATOR_VERSION=0.69.0
 
 RUN curl -fsSL -o prometheus-operator.tar.gz "https://github.com/prometheus-operator/prometheus-operator/archive/v${PROMETHEUS_OPERATOR_VERSION}.tar.gz" \
     && tar -x -z --strip-components 1 -f prometheus-operator.tar.gz \

diff --git a/prometheus-config-reloader/TAG b/prometheus-config-reloader/TAG
@@ -1 +1 @@
-0.66.0.2
+0.69.0.1
diff --git a/victoriametrics-operator/BRANCH b/victoriametrics-operator/BRANCH
@@ -1 +1 @@
-0.35
+0.39
diff --git a/victoriametrics-operator/Dockerfile b/victoriametrics-operator/Dockerfile
@@ -1,10 +1,10 @@
 # victoriametrics-operator container
 
 # Stage1: build from source
-FROM quay.io/cybozu/golang:1.20-jammy AS build
+FROM quay.io/cybozu/golang:1.21-jammy AS build
 
 ARG VICTORIAMETRICS_OPERATOR_SRCREPO=VictoriaMetrics/operator
-ARG VICTORIAMETRICS_OPERATOR_VERSION=0.35.1
+ARG VICTORIAMETRICS_OPERATOR_VERSION=0.39.1
 
 # Workaround https://github.com/ksonnet/ksonnet/issues/298#issuecomment-360531855
 ENV USER=root

diff --git a/victoriametrics-operator/TAG b/victoriametrics-operator/TAG
@@ -1 +1 @@
-0.35.1.1
+0.39.1.1
diff --git a/victoriametrics/BRANCH b/victoriametrics/BRANCH
@@ -1 +1 @@
-1.91
+1.94
diff --git a/victoriametrics/Dockerfile b/victoriametrics/Dockerfile
@@ -1,11 +1,11 @@
 # victoriametrics-xxx container
 
 ARG VICTORIAMETRICS_SRCREPO=VictoriaMetrics/VictoriaMetrics
-ARG VICTORIAMETRICS_SINGLE_VERSION=1.91.3
-ARG VICTORIAMETRICS_CLUSTER_VERSION=1.91.3-cluster
+ARG VICTORIAMETRICS_SINGLE_VERSION=1.94.0
+ARG VICTORIAMETRICS_CLUSTER_VERSION=1.94.0-cluster
 
 # Stage1: build from source
-FROM quay.io/cybozu/golang:1.20-jammy AS build-single
+FROM quay.io/cybozu/golang:1.21-jammy AS build-single
 
 ARG VICTORIAMETRICS_SRCREPO
 ARG VICTORIAMETRICS_SINGLE_VERSION
@@ -15,7 +15,7 @@ WORKDIR /go/src/github.com/VictoriaMetrics/VictoriaMetrics
 RUN VICTORIAMETRICS_VERSION=${VICTORIAMETRICS_SINGLE_VERSION} /download_and_build.sh victoria-metrics vmagent vmalert vmbackup vmrestore vmctl
 
 #
-FROM quay.io/cybozu/golang:1.20-jammy AS build-cluster
+FROM quay.io/cybozu/golang:1.21-jammy AS build-cluster
 
 ARG VICTORIAMETRICS_SRCREPO
 ARG VICTORIAMETRICS_CLUSTER_VERSION

diff --git a/victoriametrics/TAG b/victoriametrics/TAG
@@ -1 +1 @@
-1.91.3.1
+1.94.0.1