github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86453 from pjh/lwvnic

Browse Source 
Update Windows subnet mask calculation for compatibility with future VNIC changes
This commit is contained in:
Kubernetes Prow Robot 2019-12-20 04:03:32 -08:00 committed by GitHub
commit 13e3904f0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,8 +457,17 @@ function Get_MgmtSubnet {
$addr = (Get-NetIPAddress ` $addr = (Get-NetIPAddress `
-InterfaceAlias ${net_adapter}.ifAlias ` -InterfaceAlias ${net_adapter}.ifAlias `
-AddressFamily IPv4).IPAddress -AddressFamily IPv4).IPAddress
$mask = (Get-WmiObject Win32_NetworkAdapterConfiguration | # Get the adapter's mask from the registry rather than WMI or some other
Where-Object InterfaceIndex -eq $(${net_adapter}.ifIndex)).IPSubnet[0] # approach: this is compatible with Windows' forthcoming LWVNICs (lightweight
# VNICs).
# https://github.com/kubernetes-sigs/sig-windows-tools/pull/16/commits/c5b5c67d5da6c23ad870cb16146eaa58131caf29
$adapter_registry = Get-Item `
-Path ("HKLM:\SYSTEM\CurrentControlSet\Services\Tcpip\" +
"Parameters\Interfaces\$($net_adapter.InterfaceGuid)")
# In this command the value name is 'DhcpSubnetMask' for current network
# interfaces but could be different for "LWVNIC" interfaces.
$mask = ($adapter_registry.GetValueNames() -like "*SubnetMask" |
% { $adapter_registry.GetValue($_) })
$mgmt_subnet = ` $mgmt_subnet = `
(ConvertTo_DecimalIP ${addr}) -band (ConvertTo_DecimalIP ${mask}) (ConvertTo_DecimalIP ${addr}) -band (ConvertTo_DecimalIP ${mask})
$mgmt_subnet = ConvertTo_DottedDecimalIP ${mgmt_subnet} $mgmt_subnet = ConvertTo_DottedDecimalIP ${mgmt_subnet}