From 39fe7edebde7900d532474796b5828a90244ab4a Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 25 May 2024 00:12:21 +0000 Subject: [PATCH] Updating operator-registry-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/operator-registry.yml --- .ci-operator.yaml | 2 +- go.mod | 2 +- operator-registry.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-registry.Dockerfile b/operator-registry.Dockerfile index 54d6bd9ec3..f6eef11fb6 100644 --- a/operator-registry.Dockerfile +++ b/operator-registry.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 GOPATH /go ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH @@ -11,7 +11,7 @@ RUN make build/registry cross # copy and build vendored grpc_health_probe RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/... -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 COPY --from=builder /src/bin/* /bin/registry/ COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe