Skip to content

Commit 6a8af5a

Browse files
Merge pull request #368 from openshift-bot/art-consistency-openshift-4.20-openstack-cluster-api-controllers
OCPBUGS-57559: Updating openstack-cluster-api-controllers-container image to be consistent with ART for 4.20
2 parents f5ab7fe + 20fd6e7 commit 6a8af5a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-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.23-openshift-4.19
4+
tag: rhel-9-release-golang-1.24-openshift-4.20

Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
16+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg goproxy=$(go env GOPROXY) to override the goproxy
@@ -38,7 +38,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
3838
-o manager
3939

4040
# Production image
41-
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
41+
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
4242
WORKDIR /
4343
COPY --from=builder /workspace/manager .
4444
COPY --from=builder /workspace/infracluster-controller .

hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)