From 1490f7641511dddb6e440b373af6c74791fc5267 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 23 Sep 2025 13:53:39 -0400 Subject: [PATCH] UPSTREAM: : Fix cp-manifests copying of helm charts The method used to copy the helm charts is including an extra `helm` directory in the destination path, that is making the cluster-olm-operator code just a bit more complicated than it needs to be. This fixes the copy location. Signed-off-by: Todd Short --- openshift/catalogd/cp-manifests | 2 +- openshift/operator-controller/cp-manifests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openshift/catalogd/cp-manifests b/openshift/catalogd/cp-manifests index 344fc7f69..d847c3b6c 100755 --- a/openshift/catalogd/cp-manifests +++ b/openshift/catalogd/cp-manifests @@ -19,6 +19,6 @@ fi if [ -d /openshift/helm ]; then mkdir -p "${DEST}/helm/catalogd" - cp -a /openshift/helm "${DEST}/helm/catalogd" + cp -a /openshift/helm/* "${DEST}/helm/catalogd" fi diff --git a/openshift/operator-controller/cp-manifests b/openshift/operator-controller/cp-manifests index ec8d4b0df..1b5ca00e3 100755 --- a/openshift/operator-controller/cp-manifests +++ b/openshift/operator-controller/cp-manifests @@ -19,6 +19,6 @@ fi if [ -d /openshift/helm ]; then mkdir -p "${DEST}/helm/operator-controller" - cp -a /openshift/helm "${DEST}/helm/operator-controller" + cp -a /openshift/helm/* "${DEST}/helm/operator-controller" fi