Skip to content

Commit

Permalink
UPSTREAM: <carry>: Updating ose-azure-cloud-controller-manager-contai…
Browse files Browse the repository at this point in the history 
…ner image to be consistent with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/e5df10e41b14c724468c8f78e2690f219279bfc4/images/ose-azure-cloud-controller-manager.yml
  • Loading branch information
AOS Automation Release Team committed Dec 12, 2023
1 parent 5beac87 commit 335d5c1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.20-openshift-4.15
tag: rhel-9-release-golang-1.20-openshift-4.16
4 changes: 2 additions & 2 deletions openshift-hack/images/cloud-controller-manager-openshift.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.15 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 AS builder
WORKDIR /go/src/github.com/openshift/cloud-provider-azure
COPY . .

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

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

LABEL description="Azure Cloud Controller Manager"
Expand Down

0 comments on commit 335d5c1

Please sign in to comment.