Skip to content

Commit 4b728b9

Browse files
jlebonmemodi
authored andcommitted
openshift/kubernetes: stop modifying machine-os-content (openshift#49156)
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.
1 parent c0ed178 commit 4b728b9

File tree

3 files changed

+0
-42
lines changed

3 files changed

+0
-42
lines changed

ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ base_images:
3131
name: test
3232
namespace: ocp-kni
3333
tag: dev-scripts
34-
machine-os-content-base:
35-
name: "4.16"
36-
namespace: ocp
37-
tag: machine-os-content
3834
oc-rpms:
3935
name: "4.16"
4036
namespace: ocp
@@ -90,15 +86,6 @@ images:
9086
as:
9187
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
9288
to: kubernetes-tests
93-
- context_dir: openshift-hack/images/os/
94-
inputs:
95-
base-machine-with-rpms:
96-
as:
97-
- centos:stream9
98-
machine-os-content-base:
99-
as:
100-
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
101-
to: machine-os-content
10289
- dockerfile_literal: |
10390
# This uses the new rhel-coreos base image
10491
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
@@ -146,7 +133,6 @@ promotion:
146133
- additional_images:
147134
artifacts: artifacts
148135
excluded_images:
149-
- machine-os-content
150136
- rhel-coreos
151137
name: "4.16"
152138
namespace: ocp

ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ base_images:
3131
name: test
3232
namespace: ocp-kni
3333
tag: dev-scripts
34-
machine-os-content-base:
35-
name: "4.16"
36-
namespace: ocp
37-
tag: machine-os-content
3834
oc-rpms:
3935
name: "4.16"
4036
namespace: ocp
@@ -90,15 +86,6 @@ images:
9086
as:
9187
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
9288
to: kubernetes-tests
93-
- context_dir: openshift-hack/images/os/
94-
inputs:
95-
base-machine-with-rpms:
96-
as:
97-
- centos:stream9
98-
machine-os-content-base:
99-
as:
100-
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
101-
to: machine-os-content
10289
- dockerfile_literal: |
10390
# This uses the new rhel-coreos base image
10491
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
@@ -147,7 +134,6 @@ promotion:
147134
artifacts: artifacts
148135
disabled: true
149136
excluded_images:
150-
- machine-os-content
151137
- rhel-coreos
152138
name: "4.16"
153139
namespace: ocp

ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ base_images:
3131
name: test
3232
namespace: ocp-kni
3333
tag: dev-scripts
34-
machine-os-content-base:
35-
name: "4.17"
36-
namespace: ocp
37-
tag: machine-os-content
3834
oc-rpms:
3935
name: "4.17"
4036
namespace: ocp
@@ -90,15 +86,6 @@ images:
9086
as:
9187
- registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
9288
to: kubernetes-tests
93-
- context_dir: openshift-hack/images/os/
94-
inputs:
95-
base-machine-with-rpms:
96-
as:
97-
- centos:stream9
98-
machine-os-content-base:
99-
as:
100-
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
101-
to: machine-os-content
10289
- dockerfile_literal: |
10390
# This uses the new rhel-coreos base image
10491
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
@@ -146,7 +133,6 @@ promotion:
146133
- additional_images:
147134
artifacts: artifacts
148135
excluded_images:
149-
- machine-os-content
150136
- rhel-coreos
151137
name: "4.17"
152138
namespace: ocp

0 commit comments

Comments
 (0)