Skip to content

feat(windows): add support for configuring secure TLS bootstrap client RPC timeouts #8398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cameronmeissner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(windows): add support for configuring secure TLS bootstrap client RPC timeouts #8398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion parts/windows/kuberneteswindowssetup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,16 @@ $global:TLSBootstrapToken = "{{GetTLSBootstrapTokenForKubeConfig}}"

# Secure TLS Bootstrap settings
$global:EnableSecureTLSBootstrapping = [System.Convert]::ToBoolean("{{EnableSecureTLSBootstrapping}}");
$global:SecureTLSBootstrappingDeadline = "{{GetSecureTLSBootstrappingDeadline}}";
$global:SecureTLSBootstrappingAADResource = "{{GetSecureTLSBootstrappingAADResource}}";
$global:SecureTLSBootstrappingUserAssignedIdentityID = "{{GetSecureTLSBootstrappingUserAssignedIdentityID}}";
$global:CustomSecureTLSBootstrappingClientDownloadURL = "{{GetCustomSecureTLSBootstrappingClientDownloadURL}}";
$global:SecureTLSBootstrappingValidateKubeconfigTimeout = "{{GetSecureTLSBootstrappingValidateKubeconfigTimeout}}";
$global:SecureTLSBootstrappingGetAccessTokenTimeout = "{{GetSecureTLSBootstrappingGetAccessTokenTimeout}}";
$global:SecureTLSBootstrappingGetInstanceDataTimeout = "{{GetSecureTLSBootstrappingGetInstanceDataTimeout}}";
$global:SecureTLSBootstrappingGetNonceTimeout = "{{GetSecureTLSBootstrappingGetNonceTimeout}}";
$global:SecureTLSBootstrappingGetAttestedDataTimeout = "{{GetSecureTLSBootstrappingGetAttestedDataTimeout}}";
$global:SecureTLSBootstrappingGetCredentialTimeout = "{{GetSecureTLSBootstrappingGetCredentialTimeout}}";
$global:SecureTLSBootstrappingDeadline = "{{GetSecureTLSBootstrappingDeadline}}";

# uniquely identifies AKS's Entra ID application, see: https://learn.microsoft.com/en-us/azure/aks/kubelogin-authentication#how-to-use-kubelogin-with-aks
# this is used by aks-secure-tls-bootstrap-client.exe when requesting AAD tokens
Expand Down
14 changes: 10 additions & 4 deletions staging/cse/windows/kubernetesfunc.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,16 @@ function Write-KubeClusterConfig {
NodeLabels = $global:KubeletNodeLabels;
ConfigArgs = $global:KubeletConfigArgs
SecureTLSBootstrapArgs = @{
Enabled = $global:EnableSecureTLSBootstrapping;
Deadline = $global:SecureTLSBootstrappingDeadline;
AADResource = $global:SecureTLSBootstrappingAADResource;
UserAssignedIdentityID = $global:SecureTLSBootstrappingUserAssignedIdentityID
Enabled = $global:EnableSecureTLSBootstrapping;
AADResource = $global:SecureTLSBootstrappingAADResource;
UserAssignedIdentityID = $global:SecureTLSBootstrappingUserAssignedIdentityID;
ValidateKubeconfigTimeout = $global:ValidateKubeconfigTimeout;
GetAccessTokenTimeout = $global:GetAccessTokenTimeout;
GetInstanceDataTimeout = $global:GetInstanceDataTimeout;
GetNonceTimeout = $global:GetNonceTimeout;
GetAttestedDataTimeout = $global:GetAttestedDataTimeout;
GetCredentialTimeout = $global:GetCredentialTimeout;
Deadline = $global:Deadline
Comment on lines +137 to +138
Copy link

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deadline (and GetCredentialTimeout) are being read from $global:Deadline / $global:GetCredentialTimeout, but the globals set by the Windows setup script are $global:SecureTLSBootstrappingDeadline and $global:SecureTLSBootstrappingGetCredentialTimeout. This prevents the configured deadline/timeouts from being written into kubeclusterconfig.json.

Suggested change
GetCredentialTimeout = $global:GetCredentialTimeout;
Deadline = $global:Deadline
GetCredentialTimeout = $global:SecureTLSBootstrappingGetCredentialTimeout;
Deadline = $global:SecureTLSBootstrappingDeadline

Copilot uses AI. Check for mistakes.
Comment on lines +132 to +138
Copy link

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Write-KubeClusterConfig is populating SecureTLSBootstrapArgs from $global:ValidateKubeconfigTimeout, $global:GetAccessTokenTimeout, etc., but those globals are never set (the setup script defines $global:SecureTLSBootstrappingValidateKubeconfigTimeout, $global:SecureTLSBootstrappingGetAccessTokenTimeout, etc.). As written, these values will be missing from kubeclusterconfig.json and won't reach kubeletstart/securetlsbootstrap.

Suggested change
ValidateKubeconfigTimeout = $global:ValidateKubeconfigTimeout;
GetAccessTokenTimeout = $global:GetAccessTokenTimeout;
GetInstanceDataTimeout = $global:GetInstanceDataTimeout;
GetNonceTimeout = $global:GetNonceTimeout;
GetAttestedDataTimeout = $global:GetAttestedDataTimeout;
GetCredentialTimeout = $global:GetCredentialTimeout;
Deadline = $global:Deadline
ValidateKubeconfigTimeout = $global:SecureTLSBootstrappingValidateKubeconfigTimeout;
GetAccessTokenTimeout = $global:SecureTLSBootstrappingGetAccessTokenTimeout;
GetInstanceDataTimeout = $global:SecureTLSBootstrappingGetInstanceDataTimeout;
GetNonceTimeout = $global:SecureTLSBootstrappingGetNonceTimeout;
GetAttestedDataTimeout = $global:SecureTLSBootstrappingGetAttestedDataTimeout;
GetCredentialTimeout = $global:SecureTLSBootstrappingGetCredentialTimeout;
Deadline = $global:SecureTLSBootstrappingDeadline

Copilot uses AI. Check for mistakes.
};
};
Kubeproxy = @{
Expand Down
32 changes: 28 additions & 4 deletions staging/cse/windows/provisioningscripts/kubeletstart.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@ $global:KubeletNodeLabels = $Global:ClusterConfiguration.Kubernetes.Kubelet.Node
$global:IsSkipCleanupNetwork = [System.Convert]::ToBoolean($Global:ClusterConfiguration.Services.IsSkipCleanupNetwork)

$global:EnableSecureTLSBootstrapping = [System.Convert]::ToBoolean($Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.Enabled)
$global:SecureTLSBootstrappingDeadline = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.Deadline
$global:SecureTLSBootstrappingAADResource = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.AADResource
$global:SecureTLSBootstrappingUserAssignedIdentityID = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.UserAssignedIdentityID
$global:SecureTLSBootstrappingValidateKubeconfigTimeout = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.ValidateKubeconfigTimeout
$global:SecureTLSBootstrappingGetAccessTokenTimeout = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.GetAccessTokenTimeout
$global:SecureTLSBootstrappingGetInstanceDataTimeout = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.GetInstanceDataTimeout
$global:SecureTLSBootstrappingGetNonceTimeout = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.GetNonceTimeout
$global:SecureTLSBootstrappingGetAttestedDataTimeout = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.GetAttestedDataTimeout
$global:SecureTLSBootstrappingGetCredentialTimeout = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.GetCredentialTimeout
$global:SecureTLSBootstrappingDeadline = $Global:ClusterConfiguration.Kubernetes.Kubelet.SecureTLSBootstrapArgs.Deadline

$global:AzureCNIDir = [Io.path]::Combine("$global:KubeDir", "azurecni")
$global:AzureCNIBinDir = [Io.path]::Combine("$global:AzureCNIDir", "bin")
Expand Down Expand Up @@ -108,15 +114,33 @@ if ($global:EnableSecureTLSBootstrapping) {
KubeDir = "$global:KubeDir"
MasterIP = "$global:MasterIP"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingDeadline)) {
$SecureTLSBootstrappingArgs["Deadline"] = "$global:SecureTLSBootstrappingDeadline"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrapAADResource)) {
$SecureTLSBootstrappingArgs["AADResource"] = "$global:SecureTLSBootstrapAADResource"
Comment on lines 117 to 118
Copy link

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The AAD resource value is never passed into securetlsbootstrap because this block checks/uses $global:SecureTLSBootstrapAADResource, but the variable initialized from kubeclusterconfig.json is $global:SecureTLSBootstrappingAADResource (note the missing "ping"). Use the same variable name so AADResource is forwarded when configured.

Suggested change
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrapAADResource)) {
$SecureTLSBootstrappingArgs["AADResource"] = "$global:SecureTLSBootstrapAADResource"
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingAADResource)) {
$SecureTLSBootstrappingArgs["AADResource"] = "$global:SecureTLSBootstrappingAADResource"

Copilot uses AI. Check for mistakes.
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingUserAssignedIdentityID)) {
$SecureTLSBootstrappingArgs["UserAssignedIdentityID"] = "$global:SecureTLSBootstrappingUserAssignedIdentityID"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingValidateKubeconfigTimeout)) {
$SecureTLSBootstrappingArgs["ValidateKubeconfigTimeout"] = "$global:SecureTLSBootstrappingValidateKubeconfigTimeout"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingGetAccessTokenTimeout)) {
$SecureTLSBootstrappingArgs["GetAccessTokenTimeout"] = "$global:SecureTLSBootstrappingGetAccessTokenTimeout"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingGetInstanceDataTimeout)) {
$SecureTLSBootstrappingArgs["GetInstanceDataTimeout"] = "$global:SecureTLSBootstrappingGetInstanceDataTimeout"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingGetNonceTimeout)) {
$SecureTLSBootstrappingArgs["GetNonceTimeout"] = "$global:SecureTLSBootstrappingGetNonceTimeout"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingGetAttestedDataTimeout)) {
$SecureTLSBootstrappingArgs["GetAttestedDataTimeout"] = "$global:SecureTLSBootstrappingGetAttestedDataTimeout"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingGetCredentialTimeout)) {
$SecureTLSBootstrappingArgs["GetCredentialTimeout"] = "$global:SecureTLSBootstrappingGetCredentialTimeout"
}
if (![string]::IsNullOrEmpty($global:SecureTLSBootstrappingDeadline)) {
$SecureTLSBootstrappingArgs["Deadline"] = "$global:SecureTLSBootstrappingDeadline"
}
& "c:\k\securetlsbootstrap.ps1" @SecureTLSBootstrappingArgs
}

Expand Down
45 changes: 42 additions & 3 deletions staging/cse/windows/provisioningscripts/securetlsbootstrap.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,19 @@ Param(
[Parameter(Mandatory=$false)][string]
$LogFilePath = [Io.path]::Combine("$KubeDir", "secure-tls-bootstrap.log"),
[Parameter(Mandatory=$false)][string]
$Deadline = "120s" # default deadline of 2 minutes
$ValidateKubeconfigTimeout = "",
[Parameter(Mandatory=$false)][string]
$GetAccessTokenTimeout = "",
[Parameter(Mandatory=$false)][string]
$GetInstanceDataTimeout = "",
[Parameter(Mandatory=$false)][string]
$GetNonceTimeout = "",
[Parameter(Mandatory=$false)][string]
$GetAttestedDataTimeout = "",
[Parameter(Mandatory=$false)][string]
$GetCredentialTimeout = "",
[Parameter(Mandatory=$false)][string]
$Deadline = ""
)

$global:BootstrapClientPath = [Io.path]::Combine("$KubeDir", "aks-secure-tls-bootstrap-client.exe")
Expand Down Expand Up @@ -46,14 +58,41 @@ $BootstrapClientArgList = @(
"--cloud-provider-config=$AzureConfigPath",
"--cert-dir=$CertDir",
"--kubeconfig=$KubeconfigPath",
"--log-file=$LogFilePath",
"--deadline=$Deadline"
"--log-file=$LogFilePath"
)

if (![string]::IsNullOrEmpty($UserAssignedIdentityID)) {
Write-Log "secure TLS bootstrapping user-assigned identity ID is specified: $UserAssignedIdentityID"
$BootstrapClientArgList += "--user-assigned-identity-id=$UserAssignedIdentityID"
}
if (![string]::IsNullOrEmpty($ValidateKubeconfigTimeout)) {
Write-Log "secure TLS bootstrapping validate kubeconfig timeout is specified: $ValidateKubeconfigTimeout"
$BootstrapClientArgList += "--validate-kubeconfig-timeout=$ValidateKubeconfigTimeout"
}
if (![string]::IsNullOrEmpty($GetAccessTokenTimeout)) {
Write-Log "secure TLS bootstrapping get access token timeout is specified: $GetAccessTokenTimeout"
$BootstrapClientArgList += "--get-access-token-timeout=$GetAccessTokenTimeout"
}
if (![string]::IsNullOrEmpty($GetInstanceDataTimeout)) {
Write-Log "secure TLS bootstrapping get instance data timeout is specified: $GetInstanceDataTimeout"
$BootstrapClientArgList += "--get-instance-data-timeout=$GetInstanceDataTimeout"
}
if (![string]::IsNullOrEmpty($GetNonceTimeout)) {
Write-Log "secure TLS bootstrapping get nonce timeout is specified: $GetNonceTimeout"
$BootstrapClientArgList += "--get-nonce-timeout=$GetNonceTimeout"
}
if (![string]::IsNullOrEmpty($GetAttestedDataTimeout)) {
Write-Log "secure TLS bootstrapping get attested data timeout is specified: $GetAttestedDataTimeout"
$BootstrapClientArgList += "--get-attested-data-timeout=$GetAttestedDataTimeout"
}
if (![string]::IsNullOrEmpty($GetCredentialTimeout)) {
Write-Log "secure TLS bootstrapping get credential timeout is specified: $GetCredentialTimeout"
$BootstrapClientArgList += "--get-credential-timeout=$GetCredentialTimeout"
}
if (![string]::IsNullOrEmpty($Deadline)) {
Write-Log "secure TLS bootstrapping deadline is specified: $Deadline"
$BootstrapClientArgList += "--deadline=$Deadline"
}

Write-Log "Starting secure TLS bootstrapping: invoking aks-secure-tls-bootstrap-client.exe"

Expand Down
Loading