Skip to content

Commit 99b4874

Browse files
Merge pull request #9563 from zaneb/installer-imagestream
OCPBUGS-53106: Create ConfigMap to reference baremetal-installer image
2 parents fb99a99 + 01dac77 commit 99b4874

File tree

3 files changed

+31
-0
lines changed

3 files changed

+31
-0
lines changed

images/baremetal/Dockerfile.ci

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build-node-joiner.sh
1919

2020
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
2121

22+
COPY --from=builder /go/src/github.com/openshift/installer/images/baremetal/manifests /manifests
2223
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
2324

2425
RUN dnf upgrade -y && \
@@ -35,4 +36,6 @@ RUN mkdir /output && chown 1000:1000 /output
3536
USER 1000:1000
3637
ENV HOME /output
3738
WORKDIR /output
39+
# We're not really an operator, we're just getting some data into the release image.
40+
LABEL io.openshift.release.operator=true
3841
ENTRYPOINT ["/bin/openshift-install"]
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: installer-images
6+
namespace: openshift-config
7+
annotations:
8+
include.release.openshift.io/ibm-cloud-managed: "true"
9+
include.release.openshift.io/self-managed-high-availability: "true"
10+
include.release.openshift.io/single-node-developer: "true"
11+
data:
12+
images.json: >
13+
{
14+
"installer": "registry.ci.openshift.org/openshift:baremetal-installer",
15+
"machine-os-images": "registry.ci.openshift.org/openshift:machine-os-images"
16+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
kind: ImageStream
2+
apiVersion: image.openshift.io/v1
3+
spec:
4+
tags:
5+
- name: baremetal-installer
6+
from:
7+
kind: DockerImage
8+
name: registry.ci.openshift.org/openshift:baremetal-installer
9+
- name: machine-os-images
10+
from:
11+
kind: DockerImage
12+
name: registry.ci.openshift.org/openshift:machine-os-images

0 commit comments

Comments
 (0)