Skip to content

Commit 46c65d5

Browse files
AOS Automation Release Teamcloud-team-rebase-bot
authored andcommitted
UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager-container image to be consistent with ART for 4.17
Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-azure-cloud-controller-manager.yml
1 parent 2161cea commit 46c65d5

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
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

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module sigs.k8s.io/cloud-provider-azure
22

3-
go 1.22.0
4-
5-
toolchain go1.22.2
3+
go 1.22
64

75
require (
86
github.com/Azure/azure-kusto-go v0.15.2

openshift-hack/images/cloud-controller-manager-openshift.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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/cloud-provider-azure
33
COPY . .
44

55
RUN make azure-cloud-controller-manager ARCH=$(go env GOARCH)
66

7-
FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
7+
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
88
COPY --from=builder /go/src/github.com/openshift/cloud-provider-azure/bin/cloud-controller-manager /bin/azure-cloud-controller-manager
99

1010
LABEL description="Azure Cloud Controller Manager"

0 commit comments

Comments
 (0)