From 91adf9b846dc4470f4da1dc7a6d1f7803b5ceb01 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 24 May 2024 21:34:55 +0000 Subject: [PATCH] Updating operator-lifecycle-manager-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/operator-lifecycle-manager.yml --- .ci-operator.yaml | 2 +- go.mod | 2 +- operator-lifecycle-manager.Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a83f0f8430..1e59c02c25 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.21-openshift-4.16 + tag: rhel-9-release-golang-1.22-openshift-4.17 diff --git a/go.mod b/go.mod index d48f668ec8..28f5107e55 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/operator-framework-olm -go 1.21 +go 1.22 require ( github.com/blang/semver/v4 v4.0.0 diff --git a/operator-lifecycle-manager.Dockerfile b/operator-lifecycle-manager.Dockerfile index 703db8b013..fc63d5758f 100644 --- a/operator-lifecycle-manager.Dockerfile +++ b/operator-lifecycle-manager.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder ENV GO111MODULE auto ENV GOPATH /go @@ -18,7 +18,7 @@ RUN mkdir -p .git/objects COPY . . RUN make build/olm bin/cpb -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 ADD manifests/ /manifests LABEL io.openshift.release.operator=true