Commit 57ca6f00 authored by Peter Hornyack's avatar Peter Hornyack

Enable OpenSSH on Windows nodes in test clusters.

Also switches to the most recent 64-bit version of OpenSSH for Windows. Tested: PROJECT=${CLOUDSDK_CORE_PROJECT} KUBERNETES_SKIP_CONFIRM=y NUM_NODES=2 \ NUM_WINDOWS_NODES=2 KUBE_GCE_ENABLE_IP_ALIASES=true TEST_CLUSTER=true \ ./cluster/kube-up.sh
parent f7a6b0a8
...@@ -77,6 +77,18 @@ function FetchAndImport-ModuleFromMetadata { ...@@ -77,6 +77,18 @@ function FetchAndImport-ModuleFromMetadata {
Import-Module -Force C:\$Filename Import-Module -Force C:\$Filename
} }
# Returns true if this node is part of a test cluster (see
# cluster/gce/config-test.sh).
#
# $kube_env must be set before calling this function.
function Test-IsTestCluster {
if ($kube_env.Contains('TEST_CLUSTER') -and `
($kube_env['TEST_CLUSTER'] -eq 'true')) {
return $true
}
return $false
}
try { try {
# Don't use FetchAndImport-ModuleFromMetadata for common.psm1 - the common # Don't use FetchAndImport-ModuleFromMetadata for common.psm1 - the common
# module includes variables and functions that any other function may depend # module includes variables and functions that any other function may depend
...@@ -92,6 +104,14 @@ try { ...@@ -92,6 +104,14 @@ try {
Set-PrerequisiteOptions Set-PrerequisiteOptions
$kube_env = Fetch-KubeEnv $kube_env = Fetch-KubeEnv
if (Test-IsTestCluster) {
Log-Output 'Test cluster detected, installing OpenSSH.'
FetchAndImport-ModuleFromMetadata 'install-ssh-psm1' 'install-ssh.psm1'
InstallAndStart-OpenSsh
StartProcess-WriteSshKeys
}
Set-EnvironmentVars Set-EnvironmentVars
Create-Directories Create-Directories
Download-HelperScripts Download-HelperScripts
......
...@@ -27,7 +27,8 @@ function get-windows-node-instance-metadata-from-file { ...@@ -27,7 +27,8 @@ function get-windows-node-instance-metadata-from-file {
metadata+="windows-startup-script-ps1=${KUBE_ROOT}/cluster/gce/windows/configure.ps1," metadata+="windows-startup-script-ps1=${KUBE_ROOT}/cluster/gce/windows/configure.ps1,"
metadata+="common-psm1=${KUBE_ROOT}/cluster/gce/windows/common.psm1," metadata+="common-psm1=${KUBE_ROOT}/cluster/gce/windows/common.psm1,"
metadata+="k8s-node-setup-psm1=${KUBE_ROOT}/cluster/gce/windows/k8s-node-setup.psm1," metadata+="k8s-node-setup-psm1=${KUBE_ROOT}/cluster/gce/windows/k8s-node-setup.psm1,"
metadata+="user-profile-psm1=${KUBE_ROOT}/cluster/gce/windows/user-profile.psm1," metadata+="install-ssh-psm1=${KUBE_ROOT}/cluster/gce/windows/testonly/install-ssh.psm1,"
metadata+="user-profile-psm1=${KUBE_ROOT}/cluster/gce/windows/testonly/user-profile.psm1,"
metadata+="${NODE_EXTRA_METADATA}" metadata+="${NODE_EXTRA_METADATA}"
echo "${metadata}" echo "${metadata}"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment