From 9cbc44caa9d3e8cabd6c14745e3e14b11c4e29fb Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 15 Sep 2023 19:40:16 +0000 Subject: [PATCH] Updating cluster-monitoring-operator images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/da6a5af1fa96762cc8410f09fc28c0457280f59a/images/cluster-monitoring-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 844f0d26ad..7cd14bfef5 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.20-openshift-4.14 + tag: rhel-8-release-golang-1.20-openshift-4.15 diff --git a/Dockerfile b/Dockerfile index fe50790c88..ac1f38f283 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # When bumping the Go version, don't forget to update the configuration of the # CI jobs in openshift/release. -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder WORKDIR /go/src/github.com/openshift/cluster-monitoring-operator COPY . . ENV GOFLAGS="-mod=vendor" RUN make operator-no-deps -FROM registry.ci.openshift.org/ocp/4.14:base +FROM registry.ci.openshift.org/ocp/4.15:base LABEL io.k8s.display-name="OpenShift cluster-monitoring-operator" \ io.k8s.description="This is a component of OpenShift and manages the lifecycle of the Prometheus based cluster monitoring stack." \ io.openshift.tags="openshift" \