From f0991847ffd77e2c537bc1a2965efa583b41e94c Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 25 May 2024 06:10:46 +0000 Subject: [PATCH] UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml --- .ci-operator.yaml | 2 +- go.mod | 4 ++-- openshift/operator-controller.Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a83f0f843..1e59c02c2 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 98bfb54b1..7e4bc4d07 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/operator-framework/operator-controller -go 1.21 +go 1.22 -toolchain go1.21.7 +toolchain go1.22.1 require ( github.com/Masterminds/semver/v3 v3.2.1 diff --git a/openshift/operator-controller.Dockerfile b/openshift/operator-controller.Dockerfile index a79cf4822..2af44e43e 100644 --- a/openshift/operator-controller.Dockerfile +++ b/openshift/operator-controller.Dockerfile @@ -1,9 +1,9 @@ -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 WORKDIR /build COPY . . RUN make go-build-local -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 USER 1001 COPY --from=builder /build/bin/manager /manager COPY openshift/manifests /openshift/manifests