fix: don't fail when windows cilium script not present - #9192
Open
Tim Wright (timmy-wright) wants to merge 2 commits into
Open
fix: don't fail when windows cilium script not present#9192Tim Wright (timmy-wright) wants to merge 2 commits into
Tim Wright (timmy-wright) wants to merge 2 commits into
Conversation
Tim Wright (timmy-wright)
requested review from
Chou Hu (AbelHu),
Devinwong,
Sri Harsha (SriHarsha001),
Nishchay (awesomenix),
Calvin S. (calvin197),
Cameron Meissner (cameronmeissner),
Sylvain Boily (djsly),
Ganeshkumar Ashokavardhanan (ganeshkumarashok),
Karen Chen (karenychen),
lilypan26,
Mark Ibrahim (mxj220),
Peter Damianov (pdamianov-dev),
Patrick W. Healy (phealy),
r2k1,
Runzhen (runzhen),
sulixu,
Thibault Cohen (titilambert),
Xu Xue (xuexu6666) and
Zachary (zachary-bailey)
as code owners
August 13, 2026 02:50
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Windows CSE Windows Cilium Networking installer wrapper to avoid throwing/terminating when the expected install.ps1 script is not present, by guarding the invocation with a Test-Path check and logging instead.
Changes:
- Add an existence check before invoking the Windows Cilium Networking install script.
- Log a message (instead of failing) when the install script cannot be found.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
99
to
+104
| $wcnInstallScript = $global:WindowsCiliumInstallPath | Join-Path -ChildPath 'scripts' | Join-Path -ChildPath 'install' | Join-Path -ChildPath 'install.ps1' | ||
| & $wcnInstallScript @Arguments | ||
| if (Test-Path -Path $wcnInstallScript -PathType Leaf) { | ||
| & $wcnInstallScript @Arguments | ||
| } else { | ||
| Write-Log "Windows Cilium Networking installation script could not be found: $wcnInstallScript" | ||
| } |
Comment on lines
+100
to
+104
| if (Test-Path -Path $wcnInstallScript -PathType Leaf) { | ||
| & $wcnInstallScript @Arguments | ||
| } else { | ||
| Write-Log "Windows Cilium Networking installation script could not be found: $wcnInstallScript" | ||
| } |
Contributor
Windows Unit Test Results 3 files 12 suites 47s ⏱️ Results for commit 41534ad. ♻️ This comment has been updated with latest results. |
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.
Suppressed comments (2)
staging/cse/windows/windowsciliumnetworkingfunc.ps1:63
Invoke-WindowsCiliumNetworkingInstallScriptmay now skip execution when the install script is missing, butEnable-WindowsCiliumNetworkingstill logs "installation completed successfully" unconditionally. This is misleading during debugging because the install can be a no-op without any failure.
Write-Log "Windows Cilium Networking installation completed successfully$(if ($isRebootNeeded) { ' (restart required)' })."
if ($isRebootNeeded) {
$global:RebootNeeded = $true
}
} catch {
staging/cse/windows/windowsciliumnetworkingfunc.ps1:102
- The success-path log message says "Expecting windows cilium install script" even though the file was already found, and the capitalization is inconsistent with other logs. Consider logging that the script is being executed, and make the missing-script message explicitly say it is being skipped.
if (Test-Path -Path $wcnInstallScript -PathType Leaf) {
Write-Log "Expecting windows cilium install script at: $wcnInstallScript"
& $wcnInstallScript @Arguments
} else {
Write-Log "Windows Cilium Networking installation script could not be found: $wcnInstallScript"
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #