Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3ba4111a
Unverified
Commit
3ba4111a
authored
May 17, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
May 17, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #77958 from pjh/pause-image-official
Windows GCE nodes: pull infra/pause container image during node setup
parents
3e8d49d4
5c32b4bb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletion
+19
-1
configure.ps1
cluster/gce/windows/configure.ps1
+1
-0
k8s-node-setup.psm1
cluster/gce/windows/k8s-node-setup.psm1
+18
-1
No files found.
cluster/gce/windows/configure.ps1
View file @
3ba4111a
...
@@ -116,6 +116,7 @@ try {
...
@@ -116,6 +116,7 @@ try {
Create-DockerRegistryKey
Create-DockerRegistryKey
Configure-Dockerd
Configure-Dockerd
Pull-InfraContainer
DownloadAndInstall-KubernetesBinaries
DownloadAndInstall-KubernetesBinaries
Create-NodePki
Create-NodePki
Create-KubeletKubeconfig
Create-KubeletKubeconfig
...
...
cluster/gce/windows/k8s-node-setup.psm1
View file @
3ba4111a
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
# - Document functions using proper syntax:
# - Document functions using proper syntax:
# https://technet.microsoft.com/en-us/library/hh847834(v=wps.620).aspx
# https://technet.microsoft.com/en-us/library/hh847834(v=wps.620).aspx
$INFRA_CONTAINER
=
"e2eteam/pause:3.1"
$INFRA_CONTAINER
=
'mcr.microsoft.com/k8s/core/pause:1.0.0'
$GCE_METADATA_SERVER
=
"169.254.169.254"
$GCE_METADATA_SERVER
=
"169.254.169.254"
# The "management" interface is used by the kubelet and by Windows pods to talk
# The "management" interface is used by the kubelet and by Windows pods to talk
# to the rest of the Kubernetes cluster *without NAT*. This interface does not
# to the rest of the Kubernetes cluster *without NAT*. This interface does not
...
@@ -1056,6 +1056,23 @@ function Verify-WorkerServices {
...
@@ -1056,6 +1056,23 @@ function Verify-WorkerServices {
Log_Todo
"run more verification commands."
Log_Todo
"run more verification commands."
}
}
# Pulls the infra/pause container image onto the node so that it will be
# immediately available when the kubelet tries to run pods.
# TODO(pjh): downloading the container container image may take a few minutes;
# figure out how to run this in the background while perform the rest of the
# node startup steps!
function
Pull-InfraContainer
{
$name
,
$label
=
$INFRA_CONTAINER
-split
':'
,2
if
(
-not
(
"
$(
& docker image list
)
"
-match
"
$name
.*
$label
"
))
{
& docker pull
$INFRA_CONTAINER
if
(!
$?
)
{
throw
"Error running 'docker pull
$INFRA_CONTAINER
'"
}
}
$inspect
=
"
$(
& docker inspect
$INFRA_CONTAINER
|
Out-String
)
"
Log-Output
"Infra/pause container:
`n
$inspect
"
}
# Add a registry key for docker in EventLog so that log messages are mapped
# Add a registry key for docker in EventLog so that log messages are mapped
# correctly. This is a workaround since the key is missing in the base image.
# correctly. This is a workaround since the key is missing in the base image.
# https://github.com/MicrosoftDocs/Virtualization-Documentation/pull/503
# https://github.com/MicrosoftDocs/Virtualization-Documentation/pull/503
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment