Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

feat: add support for Kubernetes 1.21.0-beta.1 #4321

Merged
merged 3 commits into from
Mar 19, 2021

Conversation

mboersma
Copy link
Member

@mboersma mboersma commented Mar 9, 2021

Reason for Change:

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.21.md#changelog-since-v1210-beta0

Issue Fixed:

Credit Where Due:

Does this change contain code from or inspired by another project?

  • No
  • Yes

Requirements:

  • Kubernetes artifacts built and pushed by Azure Pipelines
  • uses conventional commit messages
  • includes documentation
  • adds unit tests
  • tested upgrade from previous version

Notes:

@codecov
Copy link

codecov bot commented Mar 9, 2021

Codecov Report

Merging #4321 (4d4541f) into master (75d6b07) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4321   +/-   ##
=======================================
  Coverage   72.07%   72.07%           
=======================================
  Files         141      141           
  Lines       21640    21640           
=======================================
  Hits        15596    15596           
  Misses       5093     5093           
  Partials      951      951           
Impacted Files Coverage Δ
pkg/api/common/versions.go 96.37% <ø> (ø)

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 d9a2dfa...4d4541f. Read the comment docs.

jackfrancis
jackfrancis previously approved these changes Mar 11, 2021
Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@jackfrancis
Copy link
Member

@marosset @jsturtevant 1.21.0-beta.1 + containerd looks to have a regression compared to beta.0:

Warning  Failed     30m   kubelet            Error: failed to create containerd task: hcsshim::CreateComputeSystem validate-bing: The directory name is invalid.
(extra info: {"Owner":"containerd-shim-runhcs-v1.exe","SchemaVersion":{"Major":2,"Minor":1},"Container":{"GuestOs":{"HostName":"validate-dns-windows-tdhkg"},"Storage":{"Layers":[{"Id":"fd99f5a1-d5be-57d1-ac12-5f04d4e788e3","Path":"C:\\ProgramData\\containerd\\root\\io.containerd.snapshotter.v1.windows\\snapshots\\2"},{"Id":"65ed1907-894d-50ff-bdcb-cc63fb515966","Path":"C:\\ProgramData\\containerd\\root\\io.containerd.snapshotter.v1.windows\\snapshots\\1"}],"Path":"\\\\?\\Volume{5959079b-7046-47ee-aae5-5428de968dcf}\\"},"MappedDirectories":[{"HostPath":"c:\\var\\lib\\kubelet\\pods\\9c9dff15-eff4-4c54-9b84-4ab498a541bc\\containers\\validate-bing\\527f3363","ContainerPath":"c:\\dev\\termination-log"},{"HostPath":"c:\\var\\lib\\kubelet\\pods\\9c9dff15-eff4-4c54-9b84-4ab498a541bc\\volumes\\kubernetes.io~projected\\kube-api-access-wbwdx","ContainerPath":"c:\\var\\run\\secrets\\kubernetes.io\\serviceaccount","ReadOnly":true},{"HostPath":"c:\\var\\lib\\kubelet\\pods\\9c9dff15-eff4-4c54-9b84-4ab498a541bc\\etc-hosts","...
  Normal   Pulled   30m  kubelet  Container image "mcr.microsoft.com/windows/servercore:ltsc2019" already present on machine
  Normal   Created  30m  kubelet  Created container validate-google
  Warning  Failed   30m  kubelet  Error: failed to create containerd task: hcsshim::CreateComputeSystem validate-google: The directory name is invalid.
(extra info: {"Owner":"containerd-shim-runhcs-v1.exe","SchemaVersion":{"Major":2,"Minor":1},"Container":{"GuestOs":{"HostName":"validate-dns-windows-tdhkg"},"Storage":{"Layers":[{"Id":"fd99f5a1-d5be-57d1-ac12-5f04d4e788e3","Path":"C:\\ProgramData\\containerd\\root\\io.containerd.snapshotter.v1.windows\\snapshots\\2"},{"Id":"65ed1907-894d-50ff-bdcb-cc63fb515966","Path":"C:\\ProgramData\\containerd\\root\\io.containerd.snapshotter.v1.windows\\snapshots\\1"}],"Path":"\\\\?\\Volume{5959079b-7046-47ee-aae5-5428de968dcf}\\"},"MappedDirectories":[{"HostPath":"c:\\var\\lib\\kubelet\\pods\\9c9dff15-eff4-4c54-9b84-4ab498a541bc\\containers\\validate-google\\a59acf60","ContainerPath":"c:\\dev\\termination-log"},{"HostPath":"c:\\var\\lib\\kubelet\\pods\\9c9dff15-eff4-4c54-9b84-4ab498a541bc\\volumes\\kubernetes.io~projected\\kube-api-access-wbwdx","ContainerPath":"c:\\var\\run\\secrets\\kubernetes.io\\serviceaccount","ReadOnly":true},{"HostPath":"c:\\var\\lib\\kubelet\\pods\\9c9dff15-eff4-4c54-9b84-4ab498a541bc\\etc-hosts"...

Any thoughts?

@marosset
Copy link
Contributor

"windowsSku": "2019-datacenter-core-smalldisk-containerd-2005",
needs to be updated to 2019-datacenter-core-smalldisk-containerd-2103

Do you want to include that change in this PR or should I open another one?

@jackfrancis
Copy link
Member

@marosset I'll make the change here, yay for the clear resolution!

@marosset
Copy link
Contributor

marosset commented Mar 18, 2021

We enabled some functionality in k/k for containerd that that requires the Windows nodes have at least the Oct 2020 security patches. The image being used by the e2e tests here has May 2020 security patches :(

marosset
marosset previously approved these changes Mar 18, 2021
Copy link
Contributor

@marosset marosset left a comment

Choose a reason for hiding this comment

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

/lgtm

@@ -261,7 +261,7 @@ func Build(cfg *config.Config, masterSubnetID string, agentSubnetIDs []string, i
prop.WindowsProfile.ImageVersion == "" {
prop.WindowsProfile.WindowsPublisher = "microsoft-aks"
prop.WindowsProfile.WindowsOffer = "aks-windows"
prop.WindowsProfile.WindowsSku = "2019-datacenter-core-smalldisk-containerd-2005"
prop.WindowsProfile.WindowsSku = "2019-datacenter-core-smalldisk-containerd-2103"
Copy link
Contributor

Choose a reason for hiding this comment

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

Oops sorry this needs to be 2019-datacenter-core-ctrd-2103

@@ -51,7 +51,7 @@
"sshEnabled": true,
"windowsPublisher": "microsoft-aks",
"windowsOffer": "aks-windows",
"windowsSku": "2019-datacenter-core-smalldisk-containerd-2005",
"windowsSku": "2019-datacenter-core-smalldisk-containerd-2103",
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as above (2019-datacenter-core-ctrd-2103)

Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@acs-bot
Copy link

acs-bot commented Mar 19, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, marosset, mboersma

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 [jackfrancis,marosset,mboersma]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jackfrancis jackfrancis merged commit f9aadee into Azure:master Mar 19, 2021
@mboersma mboersma deleted the add-k8s-1.21.0-beta.1 branch March 19, 2021 15:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants