From 40d0ae311c5cf445517977a7e4fe72d801608468 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Thu, 21 Feb 2019 17:00:18 -0800 Subject: [PATCH] GCE: add EventLog registry key for docker --- cluster/gce/windows/configure.ps1 | 1 + cluster/gce/windows/k8s-node-setup.psm1 | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/cluster/gce/windows/configure.ps1 b/cluster/gce/windows/configure.ps1 index 1a0addc6fb..2ebb35c248 100644 --- a/cluster/gce/windows/configure.ps1 +++ b/cluster/gce/windows/configure.ps1 @@ -96,6 +96,7 @@ try { Create-Directories Download-HelperScripts + Create-DockerRegistryKey Create-PauseImage DownloadAndInstall-KubernetesBinaries Create-NodePki diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index 47779a22ee..01fe4d0072 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/cluster/gce/windows/k8s-node-setup.psm1 @@ -1030,5 +1030,25 @@ function Verify-WorkerServices { Log_Todo "run more verification commands." } +# 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. +# https://github.com/MicrosoftDocs/Virtualization-Documentation/pull/503 +# TODO: Fix this in the base image. +function Create-DockerRegistryKey { + $tmp_dir = 'C:\tmp_docker_reg' + New-Item -Force -ItemType 'directory' ${tmp_dir} | Out-Null + $reg_file = 'docker.reg' + Set-Content ${tmp_dir}\${reg_file} ` +'Windows Registry Editor Version 5.00 + [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EventLog\Application\docker] +"CustomSource"=dword:00000001 +"EventMessageFile"="C:\\Program Files\\docker\\dockerd.exe" +"TypesSupported"=dword:00000007' + + Log-Output "Importing registry key for Docker" + reg import ${tmp_dir}\${reg_file} + Remove-Item -Force -Recurse ${tmp_dir} +} + # Export all public functions: Export-ModuleMember -Function *-*