From 4b728b92bbf8f9322cf26da5ed511aa79c4e2a6a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 6 Mar 2024 09:28:53 -0500 Subject: [PATCH] openshift/kubernetes: stop modifying machine-os-content (#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 https://github.com/openshift/kubernetes/pull/1805#issuecomment-1812819515 and following. See also https://issues.redhat.com/browse/MCO-392. --- .../kubernetes/openshift-kubernetes-master.yaml | 14 -------------- .../openshift-kubernetes-release-4.16.yaml | 14 -------------- .../openshift-kubernetes-release-4.17.yaml | 14 -------------- 3 files changed, 42 deletions(-) diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml index 21cd9e9db7912..99aa83e14f418 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml @@ -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 @@ -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 @@ -146,7 +133,6 @@ promotion: - additional_images: artifacts: artifacts excluded_images: - - machine-os-content - rhel-coreos name: "4.16" namespace: ocp diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml index 5ffd47bb12b4d..2dd3982b89b45 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.16.yaml @@ -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 @@ -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 @@ -147,7 +134,6 @@ promotion: artifacts: artifacts disabled: true excluded_images: - - machine-os-content - rhel-coreos name: "4.16" namespace: ocp diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml index 164ff975ec530..34f3408cfb7a9 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.17.yaml @@ -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 @@ -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 @@ -146,7 +133,6 @@ promotion: - additional_images: artifacts: artifacts excluded_images: - - machine-os-content - rhel-coreos name: "4.17" namespace: ocp