search

openshift-knative / serverless-operator

Main source repository for Openshift Serverless
Apache License 2.0
43 stars 66 forks source link

add new infrastructure features annotations and add arm64 supported label #2650

Closed Kaustubh-pande closed 4 months ago

Kaustubh-pande commented 4 months ago
Kaustubh-pande commented 4 months ago

/cherry-pick release-1.33

openshift-cherrypick-robot commented 4 months ago

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

In response to [this](https://github.com/openshift-knative/serverless-operator/pull/2650#issuecomment-2106712891): >/cherry-pick release-1.33 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.
Kaustubh-pande commented 4 months ago

/retest

dsimansk commented 4 months ago

/approve /lgtm

openshift-ci[bot] commented 4 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dsimansk, Kaustubh-pande

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/openshift-knative/serverless-operator/blob/main/OWNERS)~~ [dsimansk] 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 4 months ago

@Kaustubh-pande: #2650 failed to apply on top of branch "release-1.33":

Applying: add new infrastructure features annotations and add arm64 supported arch label
Using index info to reconstruct a base tree...
M   olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.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 add new infrastructure features annotations and add arm64 supported arch label
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/openshift-knative/serverless-operator/pull/2650#issuecomment-2106712891): >/cherry-pick release-1.33 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.