Skip to content
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.

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

Fix non-HPC Calico for Windows issues #9016

Merged
merged 1 commit into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 7 additions & 13 deletions node/windows-packaging/CalicoWindows/node/node-service.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,10 @@ while ($True)
if ($LastExitCode -EQ 0)
{
Write-Host "Calico node initialisation succeeded; monitoring kubelet for restarts..."
Restart-TokenRefresher
# Token refresher only needs to run in hostprocess containers
if ($env:CONTAINER_SANDBOX_MOUNT_POINT) {
Restart-TokenRefresher
}
break
}

Expand All @@ -212,19 +215,10 @@ while ($True)
$kubeletPid = -1
}

# Upgrade service is not needed if node is running in a hostprocess container.
if (-not $env:CONTAINER_SANDBOX_MOUNT_POINT) {
if (!(Get-UpgradeService)) {
# If upgrade service has not been running, check if we should run upgrade service.
.\calico-node.exe -should-install-windows-upgrade
if ($LastExitCode -EQ 0) {
Install-UpgradeService
Start-Service CalicoUpgrade
}
}
# Token refresher only needs to run in hostprocess containers
if ($env:CONTAINER_SANDBOX_MOUNT_POINT) {
Ensure-TokenRefresher
}

Ensure-TokenRefresher

Start-Sleep 10
}

This file was deleted.