Add HostProcess support for Calico for Windows #5864

lmm · 2022-04-08T00:14:54Z

Description

This PR adds support for installing Calico for Windows using HostProcess containers.

Preview: https://deploy-preview-5864--calico-master.netlify.app/getting-started/windows-calico/quickstart

Related issues/PRs

Todos

Tests
Documentation
Release note

Release Note

Add tech-preview support for Calico for Windows using HostProcess containers

node/calico-windows.yaml

song-jiang

Added some comments

calico/scripts/install-calico-windows.ps1

song-jiang · 2022-04-08T10:47:16Z

calico/scripts/install-calico-windows.ps1

-SetConfigParameters -OldString '<your datastore type>' -NewString $Datastore
-SetConfigParameters -OldString '<your etcd endpoints>' -NewString "$EtcdEndpoints"
+Set-ConfigParameters -var 'CALICO_DATASTORE_TYPE' -value $Datastore
+Set-ConfigParameters -var 'ETCD_ENDPOINTS' -value $EtcdEndpoints


Using a proper lib function is a nice improvement.

calico/scripts/install-calico-windows.ps1

song-jiang · 2022-04-08T10:57:09Z

calico/scripts/install-calico-windows.ps1

+
+    Write-Host "Done, the Calico services are running:"
+    Get-Service | where Name -Like 'Calico*'
+}


Same here, maybe there is a better way?

song-jiang · 2022-04-08T10:59:53Z

node/calico-windows.yaml

+      - name: install
+        image: laurenceman/calico:latest
+        args:
+          - "$env:CONTAINER_SANDBOX_MOUNT_POINT\\install-calico-windows.ps1"


See my comment above, I'm thinking we could construct a new script and keep install-calico-windows.ps1 with limited changes.

I added a entrypoint script to attempt uninstalling Calico for Windows, then starts the installation.

song-jiang · 2022-04-08T11:10:40Z

node/calico-windows.yaml

+          exec:
+            command:
+            - c:\\CalicoWindows\\calico-node.exe
+            - -felix-live


Have we tested the command on Windows? Is it working?

Yes, this is working

song-jiang · 2022-04-08T11:14:43Z

node/windows-packaging/CalicoWindows/felix/felix-service.ps1

@@ -13,7 +13,8 @@
 # limitations under the License.

 # This script is run from the main Calico folder.
-. .\config.ps1
+# TODO: env vars will be set in the daemonset template spec.
+#. .\config.ps1


Will it break manual installation after config.ps1 being removed?

I've reverted this

song-jiang · 2022-04-08T11:16:02Z

node/windows-packaging/CalicoWindows/kubernetes/kubelet-service.ps1

@@ -19,7 +19,7 @@ Param(

 $baseDir = "$PSScriptRoot\.."
 . $baseDir\config.ps1
-ipmo $baseDir\libs\calico\calico.psm1
+ipmo $baseDir\libs\calico\calico.psm1 -Force


What is impact of --Force ?

We use -force elsewhere when importing the calico module. If the module is already loaded, force will load it again. When we uninstall calico we do not currently remove the module but that's fixed with 6e73547

song-jiang

Looking good. A few comments. I still need some time to review install kubelet part.

calico/getting-started/windows-calico/quickstart.md

calico/_includes/content/calico-windows-install.md

calico/scripts/prepare-windows-node.ps1

This sets the logging parameters for the kubelet service to be like what we currently use in our manual installation method.

song-jiang · 2022-04-25T13:31:33Z

calico/_includes/content/calico-windows-install.md

+   curl {{ "/manifests/windows-kube-proxy.yaml" | absolute_url }} -o windows-kube-proxy.yaml
+   ```
+   - Edit the downloaded manifest
+       - Replace `VERSION` with your Windows nodes' server version.


e.g. 1809.

Fixed this and a few other small issues

song-jiang · 2022-04-25T15:54:49Z

Just a minor comment but LGTM.

Add tech-preview of Calico for Windows installed using hostprocess containers

lmm requested a review from a team as a code owner April 8, 2022 00:14

marvin-tigera added this to the Calico v3.24.0 milestone Apr 8, 2022

marvin-tigera added docs-pr-required Change is not yet documented release-note-required Change has user-facing impact (no matter how small) labels Apr 8, 2022

lmm requested a review from song-jiang April 8, 2022 00:15

lmm commented Apr 8, 2022

View reviewed changes

node/calico-windows.yaml Outdated Show resolved Hide resolved

lmm commented Apr 8, 2022

View reviewed changes

node/calico-windows.yaml Outdated Show resolved Hide resolved

song-jiang reviewed Apr 8, 2022

View reviewed changes

caseydavenport modified the milestones: Calico v3.24.0, Calico v3.23.0 Apr 12, 2022

lmm added 20 commits April 17, 2022 17:43

wip

3100495

Allow install script to install only and not start Calico services

074d6f3

fix expected calico-windows.zip path

6149f7e

support reinstalling calico for windows

df2d6c6

rename "start calico after install" toggle

b4172a3

add log

0b0da48

Change windows config.ps1 loading

dce0697

don't need the extra quotes?

099c20a

force load calico.psm1 and clean up when uninstalling

6e73547

install services only for manual install and handle uninstall

a12c9b0

fix install

f951e8c

log when env var already set

5be9091

Fix node service

bf482dc

update dockerfile

b95897f

wip

12bd90f

wip: add temp daemonset yaml

c3f0c36

Remove KubeAPIServerIPAndPort param

0a64547

Refactor content to get kube-apiserver host and port

f9a26f0

Remove $Reinstall param

dd1b7b4

Add entrypoint script

98dcda9

marvin-tigera added docs-pr-required Change is not yet documented release-note-required Change has user-facing impact (no matter how small) labels Apr 19, 2022

lmm added 3 commits April 19, 2022 12:02

Update makefile

143c3e9

Refactor and update cleanup

2b82a9c

Add windows image building to ci

8176616

lmm force-pushed the lmm-win-hostprocess branch 2 times, most recently from a58019a to 8176616 Compare April 19, 2022 20:29

lmm added 3 commits April 19, 2022 18:35

Fix

e522196

Add windows node prep script

bf778f5

Update kubelet service file to take whole interface name regex

1db4016

song-jiang reviewed Apr 20, 2022

View reviewed changes

calico/getting-started/windows-calico/quickstart.md Outdated Show resolved Hide resolved

calico/_includes/content/calico-windows-install.md Outdated Show resolved Hide resolved

lmm added 4 commits April 20, 2022 10:27

Fix docs issue

d240d0a

Emphasize CALICO_NETWORKING_BACKEND value and fix typos

5da44cb

Add missing networking specific steps to host process install

04a01a3

Move manual install to the top

7aa58fc

lmm commented Apr 20, 2022

View reviewed changes

calico/scripts/prepare-windows-node.ps1 Outdated Show resolved Hide resolved

lmm added 3 commits April 21, 2022 14:34

Use modified upstream scripts to install Containerd and join node

2416a96

Fix link

d830590

Let nssm handle kubelet logs for readable logs

f30a93c

This sets the logging parameters for the kubelet service to be like what we currently use in our manual installation method.

song-jiang reviewed Apr 25, 2022

View reviewed changes

song-jiang approved these changes Apr 25, 2022

View reviewed changes

Fix issues

40cd3b0

lmm added docs-completed Docs PR has been merged for this change and removed docs-pr-required Change is not yet documented labels Apr 25, 2022

lmm merged commit 35b0c49 into projectcalico:master Apr 25, 2022

lmm added a commit to lmm/calico that referenced this pull request Apr 25, 2022

Add HostProcess support for Calico for Windows (projectcalico#5864)

5747611

Add tech-preview of Calico for Windows installed using hostprocess containers

lmm mentioned this pull request Apr 25, 2022

[release-v3.23] Add HostProcess support for Calico for Windows (#5864) #5968

Merged

3 tasks

lmm deleted the lmm-win-hostprocess branch April 25, 2022 20:06

lmm added a commit that referenced this pull request Apr 26, 2022

Add HostProcess support for Calico for Windows (#5864) (#5968)

bbcf802

Add tech-preview of Calico for Windows installed using hostprocess containers

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add HostProcess support for Calico for Windows #5864

Add HostProcess support for Calico for Windows #5864

lmm commented Apr 8, 2022 •

edited

song-jiang left a comment

song-jiang Apr 8, 2022

song-jiang Apr 8, 2022

lmm Apr 18, 2022

song-jiang Apr 8, 2022

lmm Apr 18, 2022

song-jiang Apr 8, 2022

lmm Apr 18, 2022

song-jiang Apr 8, 2022

lmm Apr 18, 2022

song-jiang Apr 8, 2022

lmm Apr 18, 2022

song-jiang left a comment

song-jiang Apr 25, 2022

lmm Apr 25, 2022

song-jiang commented Apr 25, 2022

Add HostProcess support for Calico for Windows #5864

Add HostProcess support for Calico for Windows #5864

Conversation

lmm commented Apr 8, 2022 • edited

Description

Related issues/PRs

Todos

Release Note

song-jiang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

song-jiang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

song-jiang commented Apr 25, 2022

lmm commented Apr 8, 2022 •

edited