Revert "Revert "ci-operator/step-registry/manifests: Factor day-2 manifests into own step""

ci-operator/step-registry/ipi/aws/pre/ipi-aws-pre-chain.yaml

@@ -3,6 +3,7 @@ chain:
   steps:
   - chain: ipi-conf-aws
   - chain: ipi-install
+  - ref: manifests
   documentation: |-
     The IPI setup step contains all steps that provision an OpenShift cluster
     with a default configuration on AWS.

ci-operator/step-registry/ipi/azure/pre/ipi-azure-pre-chain.yaml

@@ -3,6 +3,7 @@ chain:
   steps:
   - chain: ipi-conf-azure
   - chain: ipi-install
+  - ref: manifests
   documentation: |-
     The IPI setup step contains all steps that provision an OpenShift cluster
     with a default configuration on Azure.

ci-operator/step-registry/ipi/azure/pre/sharednetwork/ipi-azure-pre-sharednetwork-chain.yaml

@@ -3,6 +3,7 @@ chain:
   steps:
   - chain: ipi-conf-azure-sharednetwork
   - chain: ipi-install
+  - ref: manifests
   documentation: |-
     The IPI setup step contains all steps that provision an OpenShift cluster
     in a shared Virtual Network configuration on Azure.

ci-operator/step-registry/ipi/gcp/pre/ipi-gcp-pre-chain.yaml

@@ -3,6 +3,7 @@ chain:
   steps:
   - chain: ipi-conf-gcp
   - chain: ipi-install
+  - ref: manifests
   documentation: |-
     The IPI setup step contains all steps that provision an OpenShift cluster
     with a default configuration on GCP.

ci-operator/step-registry/ipi/gcp/pre/sharednetwork/ipi-gcp-pre-sharednetwork-chain.yaml

@@ -3,6 +3,7 @@ chain:
   steps:
   - chain: ipi-conf-gcp-sharednetwork
   - chain: ipi-install
+  - ref: manifests
   documentation: |-
     The IPI setup step contains all steps that provision an OpenShift cluster
     in a shared network configuration on GCP.

ci-operator/step-registry/ipi/vsphere/pre/ipi-vsphere-pre-chain.yaml

@@ -3,6 +3,7 @@ chain:
   steps:
   - chain: ipi-conf-vsphere
   - chain: ipi-install-vsphere
+  - ref: manifests
   documentation: |-
     The IPI setup step contains all steps that provision an OpenShift cluster
     with a default configuration on vSphere.

ci-operator/step-registry/manifests/OWNERS

@@ -0,0 +1,11 @@
+approvers:
+- smarterclayton
+- wking
+- stevekuznetsov
+- vrutkovs
+- abhinavdahiya
+- deads2k
+- crawford
+- ewolinetz
+- csrwng
+- staebler

ci-operator/step-registry/manifests/manifests-commands.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+
+if [[ -f "${CLUSTER_PROFILE_DIR}/insights-live.yaml" ]]
+then
+	# HACK: backwards-compat while the cluster profiles are updated.
+	cp "${CLUSTER_PROFILE_DIR}/insights-live.yaml" "${CLUSTER_PROFILE_DIR}/day-2-manifests-insights-live.yaml"
+fi
+
+for FILE in "${CLUSTER_PROFILE_DIR}"/day-2-manifests-*.yaml "${SHARED_DIR}"/day-2-manifests-*.yaml
+do
+	echo "Creating ${FILE}..."
+	oc create -f "${FILE}"
+done
+
+echo "Finished creating manifests."

ci-operator/step-registry/manifests/manifests-ref.yaml

@@ -0,0 +1,11 @@
+ref:
+  as: manifests
+  from: cli
+  commands: manifests-commands.sh
+  resources:
+    requests:
+      cpu: 300m
+      memory: 300Mi
+  documentation: |-
+    The manifests step applies additional manifests to the cluster with 'oc create -f ...'.
+    Manifests are read from ${CLUSTER_PROFILE_DIR}/day-2-manifests-*.yaml and ${SHARED_DIR}/day-2-manifests-*.yaml in that order, and application failures are fatal.

ci-operator/step-registry/openshift/e2e/aws/ovn/hybrid/openshift-e2e-aws-ovn-hybrid-workflow.yaml

@@ -6,6 +6,7 @@ workflow:
     - ref: ovn-conf
     - ref: ovn-conf-hybrid-manifest
     - chain: ipi-install
+    - ref: manifests
     test:
     - ref: openshift-e2e-test
     post:

ci-operator/step-registry/openshift/e2e/aws/ovn/openshift-e2e-aws-ovn-workflow.yaml

@@ -5,6 +5,7 @@ workflow:
     - chain: ipi-conf-aws
     - ref: ovn-conf
     - chain: ipi-install
+    - ref: manifests
     test:
     - ref: openshift-e2e-test
     post:

ci-operator/step-registry/openshift/e2e/aws/sdn/multi/openshift-e2e-aws-sdn-multi-workflow.yaml

@@ -6,6 +6,7 @@ workflow:
     - ref: sdn-conf
     - ref: sdn-conf-multi-manifest
     - chain: ipi-install
+    - ref: manifests
     test:
     - ref: openshift-e2e-test
     post:

ci-operator/step-registry/openshift/e2e/aws/sdn/single/openshift-e2e-aws-sdn-single-workflow.yaml

@@ -6,6 +6,7 @@ workflow:
     - ref: sdn-conf
     - ref: sdn-conf-single-manifest
     - chain: ipi-install
+    - ref: manifests
     test:
     - ref: openshift-e2e-test
     post:

ci-operator/step-registry/openshift/e2e/azure/ovn/openshift-e2e-azure-ovn-workflow.yaml

@@ -5,6 +5,7 @@ workflow:
     - chain: ipi-conf-azure
     - ref: ovn-conf
     - chain: ipi-install
+    - ref: manifests
     test:
     - ref: openshift-e2e-test
     post:

ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh

@@ -14,12 +14,6 @@ trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wa
 
 mkdir -p "${HOME}"
 
-# if the cluster profile included an insights secret, install it to the cluster to
-# report support data from the support-operator
-if [[ -f "${CLUSTER_PROFILE_DIR}/insights-live.yaml" ]]; then
-    oc create -f "${CLUSTER_PROFILE_DIR}/insights-live.yaml" || true
-fi
-
 # set up cloud-provider-specific env vars
 KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
 KUBE_SSH_KEY_PATH=${CLUSTER_PROFILE_DIR}/ssh-privatekey

ci-operator/step-registry/openshift/e2e/vsphere/ovn/openshift-e2e-vsphere-ovn-workflow.yaml

@@ -5,6 +5,7 @@ workflow:
     - chain: ipi-conf-vsphere
     - ref: ovn-conf
     - chain: ipi-install-vsphere
+    - ref: manifests
     test:
     - ref: openshift-e2e-test
     post:

ci-operator/step-registry/upi/gcp/pre/upi-gcp-pre-chain.yaml

@@ -4,5 +4,6 @@ chain:
   - ref: ipi-install-rbac
   - chain: upi-conf-gcp
   - ref: upi-install-gcp
+  - ref: manifests
   documentation: >-
     This chain contains all of the steps to provision an OpenShift cluster using the GCP UPI workflow.