Skip to content

Commit c56fc5f

Browse files
Merge pull request #346 from openshift-bot/art-consistency-openshift-4.17-ose-cluster-cloud-controller-manager-operator
OCPBUGS-34144: Updating ose-cluster-cloud-controller-manager-operator-container image to be consistent with ART for 4.17
2 parents affef2a + d494025 commit c56fc5f

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

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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.22-openshift-4.17 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-cloud-controller-manager-operator
33
COPY . .
44
RUN make build
55

6-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
6+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
77
COPY --from=builder /go/src/github.com/openshift/cluster-cloud-controller-manager-operator/bin/cluster-controller-manager-operator .
88
COPY --from=builder /go/src/github.com/openshift/cluster-cloud-controller-manager-operator/bin/config-sync-controllers .
99
COPY --from=builder /go/src/github.com/openshift/cluster-cloud-controller-manager-operator/bin/azure-config-credentials-injector .

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-cloud-controller-manager-operator
22

3-
go 1.21
3+
go 1.22
44

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

77
require (
88
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d

0 commit comments

Comments
 (0)