Skip to content

Commit cafb3f5

Browse files
author
AOS Automation Release Team
committed
UPSTREAM: <carry>: Updating ose-cluster-api-container image to be consistent with ART for 4.17
Reconciling with https://github.com/openshift/ocp-build-data/tree/0a1310d4df1f00e3e218da6e356585997c7c0178/images/ose-cluster-api.yml
1 parent 5830a10 commit cafb3f5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
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.21-openshift-4.16
4+
tag: rhel-9-release-golang-1.21-openshift-4.17

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/MakeNowJust/heredoc v1.0.0

openshift/Dockerfile.openshift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.17 AS builder
22

33
WORKDIR /build
44
COPY . .
@@ -7,7 +7,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=${GOOS} GOPROXY=${GOPROXY} go build \
77
-o=cluster-api-controller-manager \
88
main.go
99

10-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
10+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
1111

1212
LABEL description="Cluster API Controller Manager"
1313

0 commit comments

Comments
 (0)