From 4ef07847683f7e6abf0ca83bda9521260a26ee4d Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 3 Dec 2024 23:53:46 +0000 Subject: [PATCH] Updating ose-thanos-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/2ea3e6158c93ca104b9d59fd58a71536fa01fb2d/images/thanos.yml --- .ci-operator.yaml | 2 +- Dockerfile.ocp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 64887a08b4..7c15f83e3e 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.22-openshift-4.18 + tag: rhel-9-release-golang-1.23-openshift-4.19 diff --git a/Dockerfile.ocp b/Dockerfile.ocp index bc68360ff5..e349b64690 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder WORKDIR /go/src/github.com/improbable-eng/thanos COPY . . ENV GOFLAGS="-mod=vendor" @@ -11,7 +11,7 @@ RUN if ! yum install -y prometheus-promu; then \ curl -s -L https://github.com/prometheus/promu/releases/download/v0.5.0/promu-0.5.0.linux-amd64.tar.gz | tar -xzvf - -C /usr/bin --strip-components 1 promu-0.5.0.linux-amd64/promu; \ fi; \ promu build; -FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 LABEL io.k8s.display-name="OpenShift Thanos" \ io.k8s.description="Highly available Prometheus setup with long term storage capabilities." \ io.openshift.tags="prometheus,monitoring" \