Added check if the node is rebooted before the networks is deleted on windows #6437
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #6437 +/- ##
==========================================
+ Coverage 25.23% 25.25% +0.01%
==========================================
Files 33 33
Lines 2829 2831 +2
==========================================
+ Hits 714 715 +1
- Misses 2068 2070 +2
+ Partials 47 46 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
pkg/windows/calico.go
Outdated
| @@ -302,7 +302,8 @@ func (c *Calico) Start(ctx context.Context) error { | |||
|
|
|||
| // generateCalicoNetworks creates the overlay networks for internode networking | |||
| func (c *Calico) generateCalicoNetworks() error { | |||
| if err := deleteAllNetworks(); err != nil { | |||
| cmd := exec.Command("powershell.exe", "C:\\var\\lib\\rancher\\rke2\\bin\\node-calico.ps1") | |||
There was a problem hiding this comment.
We have in the past pushed back on just having golang call out to powershell to do things. If we wanted to do this, we could just use upstream's powershell scripts in the first place, instead of handling cni setup in golang. Why do we need a powershell script to check a registry key and reinitialize hns?
There was a problem hiding this comment.
It needs to check the latest reboot. If Calico os starting after a reboot it has to clean the network if it's after a restart of RKE2 the network shouldn't be cleaned. I can try to do the check inside golang.
rbrtbnfgl
force-pushed
the
windows_fix
branch
3 times, most recently
from
d08776a to
7af5676
Compare
rbrtbnfgl
changed the title
pkg/windows/utils.go
Outdated
| func isNodeRebooted(ctx context.Context) (bool, error) { | ||
| path, err := exec.LookPath("powershell") | ||
| if err == nil { | ||
| cmd := exec.CommandContext(ctx, path, "-NoProfile", "-NonInteractive", "@(Get-CimInstance Win32_OperatingSystem).LastBootUpTime.ToString(\"G\")") |
There was a problem hiding this comment.
You're still execing powershell. You should be able to do this using pure go. See for example: https://gistlib.com/go/get-system-boot-time-in-milliseconds-in-go
There was a problem hiding this comment.
I was searching for something similar but it seems that syscall it's not working properly on windows. I tried that code and it's not building. I'll try to check if there is something similar.
There was a problem hiding this comment.
I did something similar using a different function. Now I'm not using any exec command so I also removed the context and left as it was before.
rbrtbnfgl
changed the title
rbrtbnfgl
force-pushed
the
windows_fix
branch
2 times, most recently
from
8b5ec0d to
258b4db
Compare
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
Proposed Changes
This PR move the delete of all networks on a script that does as Calico that checks if the node is rebooted only.
The fix right now works only if the other version has already the new script check updating from an older version requires a node reboot and the bug is fixed from the next version updates.
Types of Changes
Verification
Testing
Linked Issues
#5551
User-Facing Change
Further Comments