зеркало из https://github.com/Azure/aks-engine.git
fix: ensure cni conf json is valid when exception list contains a single address (#2157)
This commit is contained in:
Родитель
65ec471f81
Коммит
f700c4746c
|
@ -90,7 +90,7 @@ Set-AzureCNIConfig
|
||||||
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList = $processedExceptions
|
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList = $processedExceptions
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList[0] = $exceptionAddresses
|
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList = $exceptionAddresses
|
||||||
}
|
}
|
||||||
|
|
||||||
$configJson.plugins.AdditionalArgs[1].Value.DestinationPrefix = $KubeServiceCIDR
|
$configJson.plugins.AdditionalArgs[1].Value.DestinationPrefix = $KubeServiceCIDR
|
||||||
|
@ -126,7 +126,8 @@ function GetBroadestRangesForEachAddress{
|
||||||
$returnValues += $ip + "/" + $range
|
$returnValues += $ip + "/" + $range
|
||||||
}
|
}
|
||||||
|
|
||||||
return $returnValues
|
# prefix $returnValues with common to ensure single values get returned as an array otherwise invalid json may be generated
|
||||||
|
return ,$returnValues
|
||||||
}
|
}
|
||||||
|
|
||||||
function GetSubnetPrefix
|
function GetSubnetPrefix
|
||||||
|
|
|
@ -30780,7 +30780,7 @@ Set-AzureCNIConfig
|
||||||
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList = $processedExceptions
|
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList = $processedExceptions
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList[0] = $exceptionAddresses
|
$configJson.plugins.AdditionalArgs[0].Value.ExceptionList = $exceptionAddresses
|
||||||
}
|
}
|
||||||
|
|
||||||
$configJson.plugins.AdditionalArgs[1].Value.DestinationPrefix = $KubeServiceCIDR
|
$configJson.plugins.AdditionalArgs[1].Value.DestinationPrefix = $KubeServiceCIDR
|
||||||
|
@ -30816,7 +30816,8 @@ function GetBroadestRangesForEachAddress{
|
||||||
$returnValues += $ip + "/" + $range
|
$returnValues += $ip + "/" + $range
|
||||||
}
|
}
|
||||||
|
|
||||||
return $returnValues
|
# prefix $returnValues with common to ensure single values get returned as an array otherwise invalid json may be generated
|
||||||
|
return ,$returnValues
|
||||||
}
|
}
|
||||||
|
|
||||||
function GetSubnetPrefix
|
function GetSubnetPrefix
|
||||||
|
|
Загрузка…
Ссылка в новой задаче