forked from IBM-Cloud/cloud-provider-ibm
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UPSTREAM: <carry>: Updating ose-ibm-cloud-controller-manager-containe…
…r image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-ibm-cloud-controller-manager.yml
- Loading branch information
AOS Automation Release Team
authored and
cloud-team-rebase-bot
committed
Oct 10, 2024
1 parent
d1e8952
commit 1bc4493
Showing
3 changed files
with
4 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.21-openshift-4.16 | ||
| tag: rhel-9-release-golang-1.22-openshift-4.17 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| module cloud.ibm.com/cloud-provider-ibm | ||
|
|
||
| go 1.23.0 | ||
| go 1.22 | ||
|
|
||
| require ( | ||
| github.com/IBM/go-sdk-core/v5 v5.17.5 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| # Build IBM cloud controller manager binary | ||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS ccm-builder | ||
| FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS ccm-builder | ||
| WORKDIR /build | ||
| COPY . . | ||
| RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o ibm-cloud-controller-manager . | ||
|
|
||
| # Assemble the final image | ||
| FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 | ||
| FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 | ||
| LABEL description="IBM Cloud Controller Manager" | ||
| COPY --from=ccm-builder /build/ibm-cloud-controller-manager /bin/ibm-cloud-controller-manager | ||
| ENTRYPOINT [ "/bin/ibm-cloud-controller-manager" ] |