search

red-hat-storage / odf-operator

OpenShift Data Foundation Meta Operator
Apache License 2.0
24 stars 57 forks source link

bundle: update ibm odf version #432

Closed iamniting closed 2 months ago

iamniting commented 2 months ago

Signed-off-by: Nitin Goyal nigoyal@redhat.com

Bugs:

https://bugzilla.redhat.com/show_bug.cgi?id=2294407 https://bugzilla.redhat.com/show_bug.cgi?id=2294409 https://bugzilla.redhat.com/show_bug.cgi?id=2294410 https://bugzilla.redhat.com/show_bug.cgi?id=2294411

iamniting commented 2 months ago

/cherry-pick release-4.16 /cherry-pick release-4.15 /cherry-pick release-4.14 /cherry-pick release-4.13

openshift-cherrypick-robot commented 2 months ago

@iamniting: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.

In response to [this](https://github.com/red-hat-storage/odf-operator/pull/432#issuecomment-2192117807): >/cherry-pick release-4.16 >/cherry-pick release-4.15 >/cherry-pick release-4.14 >/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.
openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, Nikhil-Ladha

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/main/OWNERS)~~ [iamniting] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 2 months ago

@iamniting: #432 failed to apply on top of branch "release-4.15":

Applying: bundle: update ibm odf version
Using index info to reconstruct a base tree...
M   bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
A   catalog/ibm.yaml
M   catalog/index.yaml
M   config/manager/manager.env
M   hack/make-bundle-vars.mk
Falling back to patching base and 3-way merge...
Auto-merging hack/make-bundle-vars.mk
CONFLICT (content): Merge conflict in hack/make-bundle-vars.mk
Auto-merging config/manager/manager.env
Auto-merging catalog/index.yaml
CONFLICT (content): Merge conflict in catalog/index.yaml
CONFLICT (modify/delete): catalog/ibm.yaml deleted in HEAD and modified in bundle: update ibm odf version. Version bundle: update ibm odf version of catalog/ibm.yaml left in tree.
Auto-merging bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bundle: update ibm odf version
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/432#issuecomment-2192117807): >/cherry-pick release-4.16 >/cherry-pick release-4.15 >/cherry-pick release-4.14 >/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.
openshift-cherrypick-robot commented 2 months ago

@iamniting: #432 failed to apply on top of branch "release-4.14":

Applying: bundle: update ibm odf version
Using index info to reconstruct a base tree...
M   bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
A   catalog/ibm.yaml
M   catalog/index.yaml
M   config/manager/manager.env
M   hack/make-bundle-vars.mk
Falling back to patching base and 3-way merge...
Auto-merging hack/make-bundle-vars.mk
CONFLICT (content): Merge conflict in hack/make-bundle-vars.mk
Auto-merging config/manager/manager.env
Auto-merging catalog/index.yaml
CONFLICT (content): Merge conflict in catalog/index.yaml
CONFLICT (modify/delete): catalog/ibm.yaml deleted in HEAD and modified in bundle: update ibm odf version. Version bundle: update ibm odf version of catalog/ibm.yaml left in tree.
Auto-merging bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bundle: update ibm odf version
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/432#issuecomment-2192117807): >/cherry-pick release-4.16 >/cherry-pick release-4.15 >/cherry-pick release-4.14 >/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.
openshift-cherrypick-robot commented 2 months ago

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

Applying: bundle: update ibm odf version
Using index info to reconstruct a base tree...
M   bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
M   catalog/ibm.yaml
M   catalog/index.yaml
M   config/manager/manager.env
M   hack/make-bundle-vars.mk
Falling back to patching base and 3-way merge...
Auto-merging hack/make-bundle-vars.mk
CONFLICT (content): Merge conflict in hack/make-bundle-vars.mk
Auto-merging config/manager/manager.env
Auto-merging catalog/index.yaml
CONFLICT (content): Merge conflict in catalog/index.yaml
Auto-merging catalog/ibm.yaml
CONFLICT (content): Merge conflict in catalog/ibm.yaml
Auto-merging bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bundle: update ibm odf version
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/432#issuecomment-2192117807): >/cherry-pick release-4.16 >/cherry-pick release-4.15 >/cherry-pick release-4.14 >/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.
openshift-cherrypick-robot commented 2 months ago

@iamniting: #432 failed to apply on top of branch "release-4.16":

Applying: bundle: update ibm odf version
Applying: godeps: update IBM apis
.git/rebase-apply/patch:3879: trailing whitespace.

.git/rebase-apply/patch:3879: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   vendor/golang.org/x/net/http2/frame.go
M   vendor/golang.org/x/net/http2/server.go
A   vendor/golang.org/x/net/http2/testsync.go
M   vendor/golang.org/x/net/http2/transport.go
M   vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/google.golang.org/protobuf/types/gofeaturespb/go_features.proto
Removing vendor/golang.org/x/sys/windows/empty.s
Removing vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing vendor/golang.org/x/sys/unix/epoll_zos.go
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/net/http2/frame.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/frame.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 godeps: update IBM apis
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/432#issuecomment-2192117807): >/cherry-pick release-4.16 >/cherry-pick release-4.15 >/cherry-pick release-4.14 >/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.