openshift/kubernetes: Use rhel-coreos (#37083)

Since openshift/machine-config-operator#3596 merged.
openshift · Mar 9, 2023 · 139b7d2 · 139b7d2
1 parent 6e7066b
commit 139b7d2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
@@ -31,10 +31,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.19-openshift-4.13
-  rhel-coreos-8-base:
+  rhel-coreos-base:
     name: "4.14"
     namespace: ocp
-    tag: rhel-coreos-8
+    tag: rhel-coreos
   tools:
     name: "4.14"
     namespace: ocp
@@ -75,25 +75,25 @@ images:
       - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
   to: machine-os-content
 - dockerfile_literal: |
-    # This uses the new rhel-coreos-8 base image
+    # This uses the new rhel-coreos base image
     # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
     FROM quay.io/centos/centos:stream9 as build
     # Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
     # in a container https://github.com/coreos/rpm-ostree/issues/4034
     RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download openshift-hyperkube
     # See also https://issues.redhat.com/browse/ART-4352
-    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-8
+    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos
     COPY --from=build /*.rpm /
     # Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
     RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
   inputs:
     base-machine-with-rpms:
       as:
       - quay.io/centos/centos:stream9
-    rhel-coreos-8-base:
+    rhel-coreos-base:
       as:
-      - registry.ci.openshift.org/rhcos-devel/rhel-coreos-8
-  to: rhel-coreos-8
+      - registry.ci.openshift.org/rhcos-devel/rhel-coreos
+  to: rhel-coreos
 - context_dir: build/pause
   dockerfile_path: Dockerfile.Rhel
   from: base
@@ -107,7 +107,7 @@ promotion:
     artifacts: artifacts
   excluded_images:
   - machine-os-content
-  - rhel-coreos-8
+  - rhel-coreos
   name: "4.14"
   namespace: ocp
 raw_steps:

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.14.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.14.yaml
@@ -31,10 +31,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.19-openshift-4.13
-  rhel-coreos-8-base:
+  rhel-coreos-base:
     name: "4.14"
     namespace: ocp
-    tag: rhel-coreos-8
+    tag: rhel-coreos
   tools:
     name: "4.14"
     namespace: ocp
@@ -75,25 +75,25 @@ images:
       - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
   to: machine-os-content
 - dockerfile_literal: |
-    # This uses the new rhel-coreos-8 base image
+    # This uses the new rhel-coreos base image
     # https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
     FROM quay.io/centos/centos:stream9 as build
     # Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
     # in a container https://github.com/coreos/rpm-ostree/issues/4034
     RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download openshift-hyperkube
     # See also https://issues.redhat.com/browse/ART-4352
-    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-8
+    FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos
     COPY --from=build /*.rpm /
     # Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
     RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
   inputs:
     base-machine-with-rpms:
       as:
       - quay.io/centos/centos:stream9
-    rhel-coreos-8-base:
+    rhel-coreos-base:
       as:
-      - registry.ci.openshift.org/rhcos-devel/rhel-coreos-8
-  to: rhel-coreos-8
+      - registry.ci.openshift.org/rhcos-devel/rhel-coreos
+  to: rhel-coreos
 - context_dir: build/pause
   dockerfile_path: Dockerfile.Rhel
   from: base
@@ -108,7 +108,7 @@ promotion:
   disabled: true
   excluded_images:
   - machine-os-content
-  - rhel-coreos-8
+  - rhel-coreos
   name: "4.14"
   namespace: ocp
 raw_steps: