From 1c9df53dec4f918da0edea76d3f1fa189c8582e4 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 6 Feb 2024 16:51:25 -0500 Subject: [PATCH] openshift/okd-machine-os: drop machine-os-content reference It's long been deprecated now and nothing should be relying on it anymore. See also https://issues.redhat.com/browse/MCO-392. --- .../okd-machine-os/openshift-okd-machine-os-master.yaml | 6 ------ .../openshift-okd-machine-os-release-4.16.yaml | 6 ------ .../openshift-okd-machine-os-release-4.17.yaml | 6 ------ core-services/image-mirroring/openshift/mapping_origin_4_16 | 1 - core-services/image-mirroring/openshift/mapping_origin_4_17 | 1 - 5 files changed, 20 deletions(-) diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml index 5371979979d7e..e5f45a66f8fdb 100644 --- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml +++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-master.yaml @@ -24,12 +24,6 @@ images: - destination_dir: . source_path: /tmp/Dockerfile.generated to: fedora-coreos -- dockerfile_literal: FROM fedora-coreos - inputs: - fedora-coreos: - as: - - fedora-coreos - to: machine-os-content promotion: to: - excluded_images: diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml index 952c15703c240..ddca9855a8e72 100644 --- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml +++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.16.yaml @@ -24,12 +24,6 @@ images: - destination_dir: . source_path: /tmp/Dockerfile.generated to: fedora-coreos -- dockerfile_literal: FROM fedora-coreos - inputs: - fedora-coreos: - as: - - fedora-coreos - to: machine-os-content promotion: to: - disabled: true diff --git a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml index 5f719f5ccff29..55dbbe067ffcb 100644 --- a/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml +++ b/ci-operator/config/openshift/okd-machine-os/openshift-okd-machine-os-release-4.17.yaml @@ -24,12 +24,6 @@ images: - destination_dir: . source_path: /tmp/Dockerfile.generated to: fedora-coreos -- dockerfile_literal: FROM fedora-coreos - inputs: - fedora-coreos: - as: - - fedora-coreos - to: machine-os-content promotion: to: - excluded_images: diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_16 b/core-services/image-mirroring/openshift/mapping_origin_4_16 index f476161391392..c47eeb6c8788d 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_4_16 +++ b/core-services/image-mirroring/openshift/mapping_origin_4_16 @@ -210,7 +210,6 @@ registry.ci.openshift.org/origin/4.16:local-storage-operator quay.io/openshift/o registry.ci.openshift.org/origin/4.16:machine-api-operator quay.io/openshift/origin-machine-api-operator:4.16 quay.io/openshift/origin-machine-api-operator:4.16.0 quay.io/openshift/origin-machine-api-operator:latest registry.ci.openshift.org/origin/4.16:machine-config-operator quay.io/openshift/origin-machine-config-operator:4.16 quay.io/openshift/origin-machine-config-operator:4.16.0 quay.io/openshift/origin-machine-config-operator:latest registry.ci.openshift.org/origin/4.16:machine-image-customization-controller quay.io/openshift/origin-machine-image-customization-controller:4.16 quay.io/openshift/origin-machine-image-customization-controller:4.16.0 quay.io/openshift/origin-machine-image-customization-controller:latest -registry.ci.openshift.org/origin/4.16:machine-os-content quay.io/openshift/origin-machine-os-content:4.16 quay.io/openshift/origin-machine-os-content:4.16.0 quay.io/openshift/origin-machine-os-content:latest registry.ci.openshift.org/origin/4.16:machine-os-images quay.io/openshift/origin-machine-os-images:4.16 quay.io/openshift/origin-machine-os-images:4.16.0 quay.io/openshift/origin-machine-os-images:latest registry.ci.openshift.org/origin/4.16:manila-csi-driver-operator-test quay.io/openshift/origin-manila-csi-driver-operator-test:4.16 quay.io/openshift/origin-manila-csi-driver-operator-test:4.16.0 quay.io/openshift/origin-manila-csi-driver-operator-test:latest registry.ci.openshift.org/origin/4.16:mdns-publisher quay.io/openshift/origin-mdns-publisher:4.16 quay.io/openshift/origin-mdns-publisher:4.16.0 quay.io/openshift/origin-mdns-publisher:latest diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_17 b/core-services/image-mirroring/openshift/mapping_origin_4_17 index 963457f6f8c95..ea187e2946c6d 100644 --- a/core-services/image-mirroring/openshift/mapping_origin_4_17 +++ b/core-services/image-mirroring/openshift/mapping_origin_4_17 @@ -8,7 +8,6 @@ registry.ci.openshift.org/origin/4.17:ironic quay.io/openshift/origin-ironic:4.1 registry.ci.openshift.org/origin/4.17:ironic-agent quay.io/openshift/origin-ironic-agent:4.17 quay.io/openshift/origin-ironic-agent:4.17.0 registry.ci.openshift.org/origin/4.17:libvirt-installer quay.io/openshift/origin-libvirt-installer:4.17 quay.io/openshift/origin-libvirt-installer:4.17.0 registry.ci.openshift.org/origin/4.17:machine-config-operator quay.io/openshift/origin-machine-config-operator:4.17 quay.io/openshift/origin-machine-config-operator:4.17.0 -registry.ci.openshift.org/origin/4.17:machine-os-content quay.io/openshift/origin-machine-os-content:4.17 quay.io/openshift/origin-machine-os-content:4.17.0 registry.ci.openshift.org/origin/4.17:machine-os-images quay.io/openshift/origin-machine-os-images:4.17 quay.io/openshift/origin-machine-os-images:4.17.0 registry.ci.openshift.org/origin/4.17:okd-rpms quay.io/openshift/origin-okd-rpms:4.17 quay.io/openshift/origin-okd-rpms:4.17.0 registry.ci.openshift.org/origin/4.17:openstack-installer quay.io/openshift/origin-openstack-installer:4.17 quay.io/openshift/origin-openstack-installer:4.17.0