Skip to content

Commit

Permalink
openshift/kubernetes: stop modifying machine-os-content (openshift#49156
Browse files Browse the repository at this point in the history
)

That image isn't actually used in the cluster. We already have
code in these same files to update the real image that gets used
(`rhel-coreos`), so let's just drop these references.

See also openshift/kubernetes#1805 (comment)
and following.

See also https://issues.redhat.com/browse/MCO-392.
  • Loading branch information
jlebon authored and memodi committed Mar 14, 2024
1 parent c0ed178 commit 4b728b9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
machine-os-content-base:
name: "4.16"
namespace: ocp
tag: machine-os-content
oc-rpms:
name: "4.16"
namespace: ocp
Expand Down Expand Up @@ -90,15 +86,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
to: kubernetes-tests
- context_dir: openshift-hack/images/os/
inputs:
base-machine-with-rpms:
as:
- centos:stream9
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
Expand Down Expand Up @@ -146,7 +133,6 @@ promotion:
- additional_images:
artifacts: artifacts
excluded_images:
- machine-os-content
- rhel-coreos
name: "4.16"
namespace: ocp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
machine-os-content-base:
name: "4.16"
namespace: ocp
tag: machine-os-content
oc-rpms:
name: "4.16"
namespace: ocp
Expand Down Expand Up @@ -90,15 +86,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
to: kubernetes-tests
- context_dir: openshift-hack/images/os/
inputs:
base-machine-with-rpms:
as:
- centos:stream9
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
Expand Down Expand Up @@ -147,7 +134,6 @@ promotion:
artifacts: artifacts
disabled: true
excluded_images:
- machine-os-content
- rhel-coreos
name: "4.16"
namespace: ocp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ base_images:
name: test
namespace: ocp-kni
tag: dev-scripts
machine-os-content-base:
name: "4.17"
namespace: ocp
tag: machine-os-content
oc-rpms:
name: "4.17"
namespace: ocp
Expand Down Expand Up @@ -90,15 +86,6 @@ images:
as:
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
to: kubernetes-tests
- context_dir: openshift-hack/images/os/
inputs:
base-machine-with-rpms:
as:
- centos:stream9
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
Expand Down Expand Up @@ -146,7 +133,6 @@ promotion:
- additional_images:
artifacts: artifacts
excluded_images:
- machine-os-content
- rhel-coreos
name: "4.17"
namespace: ocp
Expand Down

0 comments on commit 4b728b9

Please sign in to comment.