From c086bc1bb26cd02ac5258cc0e0b49a0ed19246f6 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Wed, 22 May 2024 16:05:44 +0000 Subject: [PATCH] Updating ose-cluster-dns-operator-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/0a1310d4df1f00e3e218da6e356585997c7c0178/images/ose-cluster-dns-operator.yml --- .ci-operator.yaml | 2 +- Dockerfile | 4 ++-- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a83f0f843..5f64fe4f1 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.21-openshift-4.17 diff --git a/Dockerfile b/Dockerfile index 218492572..a256692d0 100644 --- a/Dockerfile +++ b/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.21-openshift-4.17 AS builder WORKDIR /dns-operator COPY . . RUN make build -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 COPY --from=builder /dns-operator/dns-operator /usr/bin/ COPY manifests /manifests RUN useradd dns-operator diff --git a/go.mod b/go.mod index 03ba95d2a..4e49d6c1c 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/openshift/cluster-dns-operator go 1.21 -toolchain go1.21.9 +toolchain go1.21.7 require ( github.com/apparentlymart/go-cidr v1.0.0