cni: add back calico to test on ipa

I tested manually yesterday, but the install of calicoctl should
be automated.

Signed-off-by: vsoch <vsoch@users.noreply.github.com>

Author: vsoch

Dockerfile.d/Dockerfile.base

@@ -23,7 +23,19 @@ RUN arch="$(uname -m | sed -e s/x86_64/amd64/ -e s/aarch64/arm64/)" && \
   curl --insecure -o "${fname}" -fSL "https://github.com/flannel-io/flannel/releases/download/${FLANNEL_VERSION}/${fname}" && \
   grep "${fname}" "/tmp/SHA256SUMS.d/flannel-${FLANNEL_VERSION}" | sha256sum -c && \
   tar xzf "${fname}" -C / && \
-  rm -f "${fname}"
+  rm -f "${fname}" && \
+  # Calico (calicoctl)
+  fname="calicoctl-linux-${arch}" && \
+  curl -o "${fname}" -fSL "https://github.com/projectcalico/calico/releases/download/${CALICO_VERSION}/${fname}" && \
+  grep "${fname}" "/tmp/SHA256SUMS.d/calico-${CALICO_VERSION}" | sha256sum -c && \
+  chmod +x "${fname}" && \
+  mv "${fname}" /usr/local/bin/calicoctl && \
+  # Calico manifest - derive v3.31 from v3.31.5
+  calico_branch="$(echo "${CALICO_VERSION}" | cut -d. -f1,2)" && \
+  fname="calico.yaml" && \
+  curl -o "/${fname}" -fSL "https://raw.githubusercontent.com/projectcalico/calico/refs/heads/release-${calico_branch}/manifests/calico.yaml" && \
+  grep "${fname}" "/tmp/SHA256SUMS.d/calico-manifest-${CALICO_VERSION}" | sha256sum -c
+  
 # gettext-base: for `envsubst`
 # moreutils: for `sponge`
 # socat: for `socat` (to silence "[WARNING FileExisting-socat]" from kubeadm)

Makefile

@@ -140,7 +140,7 @@ join-command:
 .PHONY: kubeadm-init
 kubeadm-init:
 	$(NODE_SHELL) sh -euc "envsubst </usernetes/kubeadm-config.yaml >/tmp/kubeadm-config.yaml"
-	$(NODE_SHELL) kubeadm init --ignore-preflight-errors all --config /tmp/kubeadm-config.yaml --skip-token-print
+	$(NODE_SHELL) kubeadm init --config /tmp/kubeadm-config.yaml --skip-token-print
 	$(MAKE) sync-external-ip
 	@echo "# Run 'make join-command' to print the join command"
 
@@ -150,8 +150,6 @@ sync-external-ip:
 
 .PHONY: kubeadm-join
 kubeadm-join:
-	# Our kernel is too old for usernetes, so we need this
-	sed -i "s/--token/--ignore-preflight-errors=all --token/g" $(HERE)/join-command
 	$(NODE_SHELL) /bin/bash /usernetes/join-command
 	@echo "# Run 'make sync-external-ip' on the control plane"
 
@@ -161,8 +159,9 @@ kubeadm-reset:
 
 .PHONY: install-flannel
 install-flannel:
-	# Kubernetes 1.30.x removed the check for br_netfilter from kubeadm.
-	# Flannel over version 0.25 checks for br_netfilter, which won't be in the podman node.
-	# We don't actually need it there, just on the physical node, so we use newer K8s and older flannel
-	$(NODE_SHELL) kubectl apply -f https://github.com/flannel-io/flannel/releases/download/v0.25.1/kube-flannel.yml
-	#$(NODE_SHELL) /usernetes/Makefile.d/install-flannel.sh
+	$(NODE_SHELL) /usernetes/Makefile.d/install-flannel.sh
+
+.PHONY: install-calico
+install-calico:
+	# Calico daemonset changes and node-level address changes
+	$(NODE_SHELL) /usernetes/Makefile.d/calico/install-calico.sh

service/usernetes-control-plane.service

@@ -4,7 +4,7 @@ After=network-online.target
 
 [Service]
 Type=simple
-ExecStart=/usr/workspace/usernetes/service/usernetes-start-control-plane.sh podman
+ExecStart=/usr/workspace/usernetes/usernetes-ipa/service/usernetes-start-control-plane.sh podman
 LimitMEMLOCK=infinity
 # Environment="USERNETES_CONTAINER_TECH_ARG=podman"
 

service/usernetes-start-control-plane.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 # These are variables we likely will change
 # LC only supplies podman
 USERNETES_CONTAINER_TECH=${1:-"podman"} 
-USERNETES_TEMPLATE_PATH=/usr/workspace/usernetes/usernetes-develop
+USERNETES_TEMPLATE_PATH=/usr/workspace/usernetes/usernetes-ipa
 
 # We will copy join command here
 shared_join_command_dir="/usr/workspace/usernetes"

service/usernetes-start-worker.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 # These are variables we likely will change
 # LC only supplies podman
 USERNETES_CONTAINER_TECH=${1:-"podman"} 
-USERNETES_TEMPLATE_PATH=/usr/workspace/usernetes/usernetes-develop
+USERNETES_TEMPLATE_PATH=/usr/workspace/usernetes/usernetes-ipa
 
 # Logging functions for consistency (like Akihiro!)
 log() {

service/usernetes-worker.service

@@ -4,7 +4,7 @@ After=network-online.target
 
 [Service]
 Type=simple
-ExecStart=/usr/workspace/usernetes/service/usernetes-start-worker.sh podman
+ExecStart=/usr/workspace/usernetes/usernetes-ipa/service/usernetes-start-worker.sh podman
 # Environment="USERNETES_CONTAINER_TECH_ARG=podman"
 LimitMEMLOCK=infinity