Skip to content

Commit 9af05e3

Browse files
author
AOS Automation Release Team
committed
Updating ose-installer-artifacts-container image to be consistent with ART for 4.20
Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-installer-artifacts.yml
1 parent b241c4e commit 9af05e3

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
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

images/installer-artifacts/Dockerfile.rhel

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# the installer layered on top of the cluster-native Linux installer image.
33

44
# We copy from the -artifacts images because they are statically linked
5-
FROM registry.ci.openshift.org/ocp/4.19:installer-kube-apiserver-artifacts AS kas-artifacts
6-
FROM registry.ci.openshift.org/ocp/4.19:installer-etcd-artifacts AS etcd-artifacts
5+
FROM registry.ci.openshift.org/ocp/4.20:installer-kube-apiserver-artifacts AS kas-artifacts
6+
FROM registry.ci.openshift.org/ocp/4.20:installer-etcd-artifacts AS etcd-artifacts
77

88
# FIPS support is offered via the baremetal-installer image
99

10-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS macbuilder
10+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS macbuilder
1111
ENV GO_COMPLIANCE_EXCLUDE=".*"
1212
ARG TAGS=""
1313
WORKDIR /go/src/github.com/openshift/installer
@@ -16,7 +16,7 @@ COPY --from=kas-artifacts /usr/share/openshift/darwin/amd64 cluster-api/bin/darw
1616
COPY --from=etcd-artifacts /usr/share/openshift/darwin/amd64 cluster-api/bin/darwin_amd64
1717
RUN GOOS=darwin GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
1818

19-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS macarmbuilder
19+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS macarmbuilder
2020
ENV GO_COMPLIANCE_EXCLUDE=".*"
2121
ARG TAGS=""
2222
WORKDIR /go/src/github.com/openshift/installer
@@ -25,7 +25,7 @@ COPY --from=kas-artifacts /usr/share/openshift/darwin/arm64 cluster-api/bin/darw
2525
COPY --from=etcd-artifacts /usr/share/openshift/darwin/arm64 cluster-api/bin/darwin_arm64
2626
RUN GOOS=darwin GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
2727

28-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS linuxbuilder
28+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS linuxbuilder
2929
ENV GO_COMPLIANCE_EXCLUDE=".*"
3030
ARG TAGS=""
3131
WORKDIR /go/src/github.com/openshift/installer
@@ -34,7 +34,7 @@ COPY --from=kas-artifacts /usr/share/openshift/linux/amd64 cluster-api/bin/linux
3434
COPY --from=etcd-artifacts /usr/share/openshift/linux/amd64 cluster-api/bin/linux_amd64
3535
RUN GOOS=linux GOARCH=amd64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
3636

37-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS linuxarmbuilder
37+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS linuxarmbuilder
3838
ENV GO_COMPLIANCE_EXCLUDE=".*"
3939
ARG TAGS=""
4040
ARG SKIP_ENVTEST="y"
@@ -44,14 +44,14 @@ COPY --from=kas-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux
4444
COPY --from=etcd-artifacts /usr/share/openshift/linux/arm64 cluster-api/bin/linux_arm64
4545
RUN GOOS=linux GOARCH=arm64 DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh
4646

47-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
47+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
4848
ENV GO_COMPLIANCE_EXCLUDE=".*"
4949
ARG TAGS=""
5050
WORKDIR /go/src/github.com/openshift/installer
5151
COPY . .
5252
RUN go run -mod=vendor hack/build-coreos-manifest.go
5353

54-
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
54+
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
5555
COPY --from=macbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac/openshift-install
5656
COPY --from=macarmbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/mac_arm64/openshift-install
5757
COPY --from=linuxbuilder /go/src/github.com/openshift/installer/bin/openshift-install /usr/share/openshift/linux_amd64/openshift-install

0 commit comments

Comments
 (0)