vexxhost / atmosphere

Simple & easy private cloud platform featuring VMs, Kubernetes & bare-metal
79 stars 19 forks source link

Start using Tini for Open vSwitch #1456

Closed mnaser closed 1 week ago

mnaser commented 1 week ago
mnaser commented 1 week ago

/cherry-pick stable/2024.1

vexxhost-bot commented 1 week ago

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/2024.1 in a new PR and assign it to you.

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273435): >/cherry-pick stable/2024.1 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.
mnaser commented 1 week ago

/cherry-pick stable/2023.2

vexxhost-bot commented 1 week ago

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/2023.2 in a new PR and assign it to you.

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273519): >/cherry-pick stable/2023.2 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.
mnaser commented 1 week ago

/cherry-pick stable/2023.1

vexxhost-bot commented 1 week ago

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/2023.1 in a new PR and assign it to you.

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273593): >/cherry-pick stable/2023.1 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.
mnaser commented 1 week ago

/cherry-pick stable/zed

vexxhost-bot commented 1 week ago

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/zed in a new PR and assign it to you.

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273683): >/cherry-pick stable/zed 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.
mnaser commented 1 week ago

regate

vexxhost-bot commented 1 week ago

@mnaser: new pull request created: #1467

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273435): >/cherry-pick stable/2024.1 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.
vexxhost-bot commented 1 week ago

@mnaser: new pull request created: #1468

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273519): >/cherry-pick stable/2023.2 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.
vexxhost-bot commented 1 week ago

@mnaser: new pull request created: #1469

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273593): >/cherry-pick stable/2023.1 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.
vexxhost-bot commented 1 week ago

@mnaser: #1456 failed to apply on top of branch "stable/zed":

Applying: Add tini to Open vSwitch
Using index info to reconstruct a base tree...
M   images/openvswitch/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging images/openvswitch/Dockerfile
CONFLICT (content): Merge conflict in images/openvswitch/Dockerfile
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 tini to Open vSwitch
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/vexxhost/atmosphere/pull/1456#issuecomment-2192273683): >/cherry-pick stable/zed 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.
vexxhost-bot commented 1 week ago

@mnaser: new issue created for failed cherrypick: #1470

In response to [this](https://github.com/vexxhost/atmosphere/pull/1456#issuecomment-2192273683): >/cherry-pick stable/zed 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.