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

1.22 version bumps and use stable cni-plugins release #1838

Merged
merged 2 commits into from Oct 12, 2021

Conversation

rosskirkpat
Copy link
Contributor

@rosskirkpat rosskirkpat commented Sep 17, 2021

Proposed Changes

version bumps for the first rke2 release of 1.22
Calico to 3.20.1
Containerd to 1.5.7
cni-plugins to 1.0.1

no docs changed required

Types of Changes

version bumps only

Verification

dockerfile builds with new versions

Linked Issues

#1839
#1595

Further Comments

@rosskirkpat rosskirkpat added this to the v1.22.2+rke2r1 milestone Sep 17, 2021
@rosskirkpat rosskirkpat self-assigned this Sep 17, 2021
@rosskirkpat rosskirkpat requested a review from a team as a code owner September 17, 2021 13:45
@rosskirkpat rosskirkpat added this to Working in Development [DEPRECATED] via automation Sep 17, 2021
@rosskirkpat rosskirkpat moved this from Working to Peer Review in Development [DEPRECATED] Sep 17, 2021
@rosskirkpat
Copy link
Contributor Author

Reasoning:

  • Without this version bump, we would be shipping 1.22 with a 1.21 crictl for Windows
  • The Windows dockerfile is still using the 1.16.6b7 build base instead of 1.16.7b7. I believe there are CVEs in 6b7

@codecov-commenter
Copy link

Codecov Report

Merging #1838 (70a5244) into master (0ea3a4d) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #1838   +/-   ##
======================================
  Coverage    8.59%   8.59%           
======================================
  Files          21      21           
  Lines        1885    1885           
======================================
  Hits          162     162           
  Misses       1696    1696           
  Partials       27      27           
Flag Coverage Δ
unittests 8.59% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ea3a4d...70a5244. Read the comment docs.

Copy link
Contributor

@phillipsj phillipsj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Development [DEPRECATED] automation moved this from Peer Review to Approved PRs Sep 17, 2021
Copy link
Contributor

@brandond brandond left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please hold off on merging this until #1827 lands; I'd prefer not to have Windows go to 1.22 before the rest of the project does.

Development [DEPRECATED] automation moved this from Approved PRs to Peer Review Sep 17, 2021
@nickgerace
Copy link

nickgerace commented Sep 17, 2021

@brandond is this is a technical limitation, supportability one, or other? Could this PR cause a breakage by being merged first?

@brandond
Copy link
Contributor

brandond commented Sep 17, 2021

It just feels backwards; the servers should be upgraded before agents so it doesn't make sense to have the Windows agents on 1.22 while everything else is still on 1.21.

I can merge that PR as it currently stands if that would help. At this point it's all just stuff in rke2-charts that needs to be fixed.

@nickgerace
Copy link

@brandond that makes sense to me, I was just curious if there was a technical component I was missing here. Thanks for the explanation.

Development [DEPRECATED] automation moved this from Peer Review to Approved PRs Oct 11, 2021
@brandond brandond merged commit 8821dc4 into rancher:master Oct 12, 2021
Development [DEPRECATED] automation moved this from Approved PRs to Done Issue / Merged PR Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development [DEPRECATED]
Done Issue / Merged PR
Development

Successfully merging this pull request may close these issues.

None yet

6 participants