From f890643d255075670ed3752702857e4c636b205d Mon Sep 17 00:00:00 2001
From: Urvashi Mohnani <umohnani@redhat.com>
Date: Fri, 7 May 2021 10:31:27 -0400
Subject: [PATCH] o/k: move pause image from openshift/images repo

Since openshift/ocp-build-data#873, the pause
image is built from openshift/kubernetes instead of openshift/images.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
---
 .../config/openshift/images/openshift-images-master.yaml      | 4 ----
 .../config/openshift/images/openshift-images-release-4.8.yaml | 4 ----
 .../config/openshift/images/openshift-images-release-4.9.yaml | 4 ----
 .../openshift/kubernetes/openshift-kubernetes-master.yaml     | 4 ++++
 .../kubernetes/openshift-kubernetes-release-4.8.yaml          | 4 ++++
 .../kubernetes/openshift-kubernetes-release-4.9.yaml          | 4 ++++
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ci-operator/config/openshift/images/openshift-images-master.yaml b/ci-operator/config/openshift/images/openshift-images-master.yaml
index fed72dbddd346..0536df29dc404 100644
--- a/ci-operator/config/openshift/images/openshift-images-master.yaml
+++ b/ci-operator/config/openshift/images/openshift-images-master.yaml
@@ -36,10 +36,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.8
   to: base
-- context_dir: build/pause
-  dockerfile_path: Dockerfile.Rhel
-  from: base
-  to: pod
 - context_dir: egress/router
   from: base
   to: egress-router
diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.8.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.8.yaml
index aa1f2342b8535..11e218fff9b89 100644
--- a/ci-operator/config/openshift/images/openshift-images-release-4.8.yaml
+++ b/ci-operator/config/openshift/images/openshift-images-release-4.8.yaml
@@ -36,10 +36,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.8
   to: base
-- context_dir: build/pause
-  dockerfile_path: Dockerfile.Rhel
-  from: base
-  to: pod
 - context_dir: egress/router
   from: base
   to: egress-router
diff --git a/ci-operator/config/openshift/images/openshift-images-release-4.9.yaml b/ci-operator/config/openshift/images/openshift-images-release-4.9.yaml
index a2d11282f24ea..e0d8276940382 100644
--- a/ci-operator/config/openshift/images/openshift-images-release-4.9.yaml
+++ b/ci-operator/config/openshift/images/openshift-images-release-4.9.yaml
@@ -36,10 +36,6 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.8
   to: base
-- context_dir: build/pause
-  dockerfile_path: Dockerfile.Rhel
-  from: base
-  to: pod
 - context_dir: egress/router
   from: base
   to: egress-router
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
index 0bdbb26372dac..0ee334f340d54 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
@@ -75,6 +75,10 @@ images:
       as:
       - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
   to: machine-os-content
+- context_dir: build/pause
+  dockerfile_path: Dockerfile.Rhel
+  from: base
+  to: pod
 promotion:
   additional_images:
     artifacts: artifacts
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml
index 36ca43a58d5ca..d62ede8dc487a 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.8.yaml
@@ -75,6 +75,10 @@ images:
       as:
       - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
   to: machine-os-content
+- context_dir: build/pause
+  dockerfile_path: Dockerfile.Rhel
+  from: base
+  to: pod
 promotion:
   additional_images:
     artifacts: artifacts
diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml
index ecb3a11e17d61..339eb8ef64164 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-release-4.9.yaml
@@ -75,6 +75,10 @@ images:
       as:
       - registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
   to: machine-os-content
+- context_dir: build/pause
+  dockerfile_path: Dockerfile.Rhel
+  from: base
+  to: pod
 promotion:
   additional_images:
     artifacts: artifacts