search

red-hat-storage / odf-operator

OpenShift Data Foundation Meta Operator
Apache License 2.0
25 stars 58 forks source link

[release-4.14] create a mechanism to deploy odf using operator-sdk #447

Closed openshift-cherrypick-robot closed 3 months ago

openshift-cherrypick-robot commented 3 months ago

This is an automated cherry-pick of #394 #412 #440

/assign iamniting

iamniting commented 3 months ago

/test odf-operator-e2e-aws /test ci-bundle-odf-operator-bundle /test images

openshift-ci[bot] commented 3 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, malayparida2000, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/red-hat-storage/odf-operator/blob/release-4.14/OWNERS)~~ [iamniting] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
iamniting commented 3 months ago

/cherry-pick release-4.13

openshift-cherrypick-robot commented 3 months ago

@iamniting: #447 failed to apply on top of branch "release-4.13":

Applying: makefile: create a separate catalog image for deps
Using index info to reconstruct a base tree...
M   Makefile
M   hack/make-bundle-vars.mk
Falling back to patching base and 3-way merge...
Auto-merging hack/make-bundle-vars.mk
Auto-merging Makefile
Applying: action: update action to verify catalog changes
Using index info to reconstruct a base tree...
M   .github/workflows/docker-build.yaml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/docker-build.yaml
CONFLICT (content): Merge conflict in .github/workflows/docker-build.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 action: update action to verify catalog changes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/red-hat-storage/odf-operator/pull/447#issuecomment-2236537640): >/cherry-pick release-4.13 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.