Skip to content
This repository has been archived by the owner on Mar 14, 2024. It is now read-only.

[release-4.9] WINC-602: [wmcb] Support Windows Server 2022 #332

Merged
merged 1 commit into from
Feb 10, 2022
Merged

[release-4.9] WINC-602: [wmcb] Support Windows Server 2022 #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/bootstrapper/bootstrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const (
// this is used to parse the kubelet args
kubeletSystemdName = "kubelet.service"
// kubeletPauseContainerImage is the location of the image we will use for the kubelet pause container
kubeletPauseContainerImage = "mcr.microsoft.com/oss/kubernetes/pause:3.4.1"
kubeletPauseContainerImage = "mcr.microsoft.com/oss/kubernetes/pause:3.6"
// serviceWaitTime is amount of wait time required for the Windows service API to complete stop requests
serviceWaitTime = time.Second * 20
// certDirectory is where the kubelet will look for certificates
Expand Down
2 changes: 1 addition & 1 deletion pkg/bootstrapper/bootstrapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ func TestKubeletArgs(t *testing.T) {
baseExpectedArgs := []string{"--config=\\fakepath\\kubelet.conf",
"--bootstrap-kubeconfig=" + filepath.Join(dir, "bootstrap-kubeconfig"),
"--kubeconfig=\\fakepath\\kubeconfig",
"--pod-infra-container-image=mcr.microsoft.com/oss/kubernetes/pause:3.4.1",
"--pod-infra-container-image=mcr.microsoft.com/oss/kubernetes/pause:3.6",
"--cert-dir=c:\\var\\lib\\kubelet\\pki\\",
"--windows-service",
"--logtostderr=false",
Expand Down