UPSTREAM: <carry>: Remove kustomize manifests from images and repo

Now that helm manifests are being used to dynamically generate the
manifests, the pre-generated manifests are no longer needed. So,
we can remove them from the repo and the images.

However, because we still want to verify the manifests are "good",
we are still creating a "single-file" version of the manifests
for verification purposes, and to allow us to see what changes
are happening to the manifests (from upstream and/or downstream
sources).

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

openshift/Makefile

@@ -26,11 +26,6 @@ verify: ## Run downstream-specific verify
 .PHONY: manifests
 manifests: $(YQ) $(HELM)
 	$(DIR)/helm/generate-manifests.sh
-	# Make a single file of each manifest for comparison purposes
-	cat $(DIR)/operator-controller/manifests/*.yml > $(DIR)/operator-controller/manifests.yaml
-	cat $(DIR)/operator-controller/manifests-experimental/*.yml > $(DIR)/operator-controller/manifests-experimental.yaml
-	cat $(DIR)/catalogd/manifests/*.yml > $(DIR)/catalogd/manifests.yaml
-	cat $(DIR)/catalogd/manifests-experimental/*.yml > $(DIR)/catalogd/manifests-experimental.yaml
 
 .PHONY: verify-manifests
 verify-manifests: manifests

openshift/catalogd.Dockerfile

@@ -10,8 +10,6 @@ FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
 USER 1001
 COPY --from=builder /build/bin/catalogd /catalogd
 COPY openshift/catalogd/cp-manifests /cp-manifests
-COPY openshift/catalogd/manifests /openshift/manifests
-COPY openshift/catalogd/manifests-experimental /openshift/manifests-experimental
 COPY helm/olmv1 /openshift/helm/olmv1
 COPY openshift/helm/experimental.yaml /openshift/helm
 COPY openshift/helm/catalogd.yaml /openshift/helm/openshift.yaml

openshift/catalogd/cp-manifests

@@ -7,16 +7,6 @@ fi
 
 DEST=${1}
 
-if [ -d /openshift/manifests ]; then
-    mkdir -p "${DEST}/standard/catalogd"
-    cp -a /openshift/manifests "${DEST}/standard/catalogd"
-fi
-
-if [ -d /openshift/manifests-experimental ]; then
-    mkdir -p "${DEST}/experimental/catalogd"
-    cp -a /openshift/manifests-experimental "${DEST}/experimental/catalogd"
-fi
-
 if [ -d /openshift/helm ]; then
     mkdir -p "${DEST}/helm/catalogd"
     cp -a /openshift/helm/* "${DEST}/helm/catalogd"