Skip to content

Commit e1bfcc0

Browse files
authored
Revert "OCPBUGS-34287: Updating cluster-version-operator-container image to be consistent with ART for 4.17"
1 parent 99c3a37 commit e1bfcc0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.22-openshift-4.17
4+
tag: rhel-9-release-golang-1.21-openshift-4.16

Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-version-operator
33
COPY . .
44
RUN hack/build-go.sh; \
55
mkdir -p /tmp/build; \
66
cp _output/linux/$(go env GOARCH)/cluster-version-operator /tmp/build/cluster-version-operator
77

8-
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
99
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
1010
COPY install /manifests
1111
COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_* /manifests/

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/openshift/cluster-version-operator
22

3-
go 1.22
3+
go 1.21
44

5-
toolchain go1.22.1
5+
toolchain go1.21.6
66

77
require (
88
github.com/blang/semver/v4 v4.0.0

0 commit comments

Comments
 (0)