Cherry-picking error for 3d1d0876594346c73dc403fe4137da5310a6e855 #1713
Description
gitstream tried to cherry-pick commit 3d1d0876594346c73dc403fe4137da5310a6e855 from https://github.com/kubernetes-sigs/kernel-module-management but was unable to do so.
Commit message:
Fixing the image references in the bundle samples.
When building the bundle locally we usually use `make bundle` but when
building it in cloudbuild for publishing in operatorhub.io, we use
`make bundle ... USE_IMAGEDIGESTS=true` which will eventually generate
the manifests and run `operator-sdk generate bundle ...
--use-image-digests`.
While the main purpose of this flag is to refer all images by digest, it
also, as a side effect, pull those images to discover their digest.
Since we are using dummy images in the CSV samples, with a "real" image
URL, operator-sdk treats those as actual pullable images, and tries to
pull them to discover their digest.
This commit is changing the dummy images with a "place holder
description" instead of a valuable URL to prevent `operator-sdk`
treating those as real images.
Signed-off-by: Yoni Bettan <[email protected]>
Please cherry-pick the commit manually.
Error:
could not cherry-pick: error running git: exit status 1
Command: /usr/bin/git cherry-pick -n 3d1d0876594346c73dc403fe4137da5310a6e855 -m1
Output
CONFLICT (modify/delete): config/samples/kmm.sigs.x-k8s.io_modulebuildsignconfigs.yaml deleted in HEAD and modified in 3d1d0876 (Fixing the image references in the bundle samples.). Version 3d1d0876 (Fixing the image references in the bundle samples.) of config/samples/kmm.sigs.x-k8s.io_modulebuildsignconfigs.yaml left in tree.
CONFLICT (modify/delete): config/samples/kmm.sigs.x-k8s.io_moduleimagesconfigs.yaml deleted in HEAD and modified in 3d1d0876 (Fixing the image references in the bundle samples.). Version 3d1d0876 (Fixing the image references in the bundle samples.) of config/samples/kmm.sigs.x-k8s.io_moduleimagesconfigs.yaml left in tree.
CONFLICT (modify/delete): config/samples/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml deleted in HEAD and modified in 3d1d0876 (Fixing the image references in the bundle samples.). Version 3d1d0876 (Fixing the image references in the bundle samples.) of config/samples/kmm.sigs.x-k8s.io_nodemodulesconfigs.yaml left in tree.
error: could not apply 3d1d0876... Fixing the image references in the bundle samples.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: Disable this message with "git config set advice.mergeConflict false"
Upstream-Commit: 3d1d0876594346c73dc403fe4137da5310a6e855