Skip to content

Conversation

@mgfritch
Copy link
Contributor

@mgfritch mgfritch commented Mar 6, 2025

Manually resolve chart conflicts for update to flannel v0.26.5

Also adds the bandwidth plugin to the cniConf

@rbrtbnfgl
Copy link
Contributor

Also changing the cniConf value adding

{
      "type":"bandwidth",
      "capabilities":{
        "bandwidth":true
      }
    }

@mgfritch mgfritch force-pushed the bump-flannel-v0.26.5 branch from cdc9317 to 3310e98 Compare March 6, 2025 16:29
Signed-off-by: Michael Fritch <[email protected]>
@mgfritch mgfritch force-pushed the bump-flannel-v0.26.5 branch from 3310e98 to e772829 Compare March 6, 2025 16:30
@mgfritch mgfritch requested a review from rbrtbnfgl March 6, 2025 16:43
@mgfritch mgfritch force-pushed the bump-flannel-v0.26.5 branch from 7aff0ba to f641727 Compare March 6, 2025 16:54
@mgfritch mgfritch merged commit 024f581 into rancher:main-source Mar 6, 2025
1 check passed
@mgfritch mgfritch deleted the bump-flannel-v0.26.5 branch March 6, 2025 17:07
github-actions bot pushed a commit that referenced this pull request Mar 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants