github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84538 from yliaog/windows

Browse Source 
switched to use the pause image served from gcr
This commit is contained in:
Kubernetes Prow Robot 2019-10-30 21:56:26 -07:00 committed by GitHub
commit 382f28ac63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/windows/configure.ps1
View File

@ -140,7 +140,6 @@ try {
Create-DockerRegistryKey Create-DockerRegistryKey
Configure-Dockerd Configure-Dockerd
Pull-InfraContainer
DownloadAndInstall-KubernetesBinaries DownloadAndInstall-KubernetesBinaries
Create-NodePki Create-NodePki
Create-KubeletKubeconfig Create-KubeletKubeconfig
@ -159,6 +158,8 @@ try {
$config = New-FileRotationConfig $config = New-FileRotationConfig
Schedule-LogRotation -Pattern '.*\.log$' -Path ${env:LOGS_DIR} -RepetitionInterval $(New-Timespan -Hour 1) -Config $config Schedule-LogRotation -Pattern '.*\.log$' -Path ${env:LOGS_DIR} -RepetitionInterval $(New-Timespan -Hour 1) -Config $config
Pull-InfraContainer
} }
catch { catch {
Write-Host 'Exception caught in script:' Write-Host 'Exception caught in script:'

2
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -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 = 'mcr.microsoft.com/k8s/core/pause:1.0.0' $INFRA_CONTAINER = 'gcr.io/gke-release/pause-win: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