Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump kube-router image to v1.6.0-iptables1.8.9-1 #3853

Merged

Conversation

jnummelin
Copy link
Member

Description

This is to fix the embedded gobgp tooling incompatibility issue

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@jnummelin jnummelin requested a review from a team as a code owner December 20, 2023 13:31
@jnummelin jnummelin requested review from kke and makhov December 20, 2023 13:31
twz123
twz123 previously approved these changes Dec 20, 2023
inttest/basic/basic_test.go Show resolved Hide resolved
inttest/basic/basic_test.go Show resolved Hide resolved
… incompatibility issue

Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
@jnummelin jnummelin force-pushed the fix/kube-router-v1.6.0-iptables1.8.9-1 branch from c985596 to 14f9e6d Compare December 21, 2023 01:52
@jnummelin jnummelin merged commit 8965e93 into k0sproject:main Jan 3, 2024
71 checks passed
@jnummelin jnummelin added backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch backport/release-1.27 PR that needs to be backported/cherrypicked to release-1.27 branch backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch labels Jan 8, 2024
@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Backport failed for release-1.26, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.26
git worktree add -d .worktree/backport-3853-to-release-1.26 origin/release-1.26
cd .worktree/backport-3853-to-release-1.26
git switch --create backport-3853-to-release-1.26
git cherry-pick -x 14f9e6d7d6c7bbf0a8892705dfdebdaab89fcd20

1 similar comment
@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Backport failed for release-1.26, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.26
git worktree add -d .worktree/backport-3853-to-release-1.26 origin/release-1.26
cd .worktree/backport-3853-to-release-1.26
git switch --create backport-3853-to-release-1.26
git cherry-pick -x 14f9e6d7d6c7bbf0a8892705dfdebdaab89fcd20

@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Backport failed for release-1.27, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.27
git worktree add -d .worktree/backport-3853-to-release-1.27 origin/release-1.27
cd .worktree/backport-3853-to-release-1.27
git switch --create backport-3853-to-release-1.27
git cherry-pick -x 14f9e6d7d6c7bbf0a8892705dfdebdaab89fcd20

1 similar comment
@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Backport failed for release-1.27, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.27
git worktree add -d .worktree/backport-3853-to-release-1.27 origin/release-1.27
cd .worktree/backport-3853-to-release-1.27
git switch --create backport-3853-to-release-1.27
git cherry-pick -x 14f9e6d7d6c7bbf0a8892705dfdebdaab89fcd20

@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Successfully created backport PR for release-1.28:

@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Successfully created backport PR for release-1.28:

@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Backport failed for release-1.26, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.26
git worktree add -d .worktree/backport-3853-to-release-1.26 origin/release-1.26
cd .worktree/backport-3853-to-release-1.26
git switch --create backport-3853-to-release-1.26
git cherry-pick -x 14f9e6d7d6c7bbf0a8892705dfdebdaab89fcd20

@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Backport failed for release-1.27, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-1.27
git worktree add -d .worktree/backport-3853-to-release-1.27 origin/release-1.27
cd .worktree/backport-3853-to-release-1.27
git switch --create backport-3853-to-release-1.27
git cherry-pick -x 14f9e6d7d6c7bbf0a8892705dfdebdaab89fcd20

@k0s-bot
Copy link

k0s-bot commented Jan 8, 2024

Git push to origin failed for release-1.28 with exitcode 1

@jnummelin jnummelin removed backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch backport/release-1.27 PR that needs to be backported/cherrypicked to release-1.27 branch labels Jan 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants