Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions openshift/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions openshift/catalogd.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions openshift/catalogd/cp-manifests
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
141 changes: 0 additions & 141 deletions openshift/catalogd/generate-manifests.sh

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading