Skip to content

Commit 39cdc88

Browse files
kvapsIvanHuntersmyasnikovdaniil
committed
feat(kubernetes): bootstrap tenant workers with Talos via CABPT
Switch tenant worker bootstrap from Ubuntu+kubeadm to Talos. MachineDeployment.bootstrap moves from KubeadmConfigTemplate to a TalosConfigTemplate produced by a post-install/upgrade reconcile hook, which also materialises the kubeadm-format bootstrap-token Secret in the tenant kube-system. Workers boot from the Talos openstack image via a CDI DataVolume; the system disk is virtio-blk with logical=512/physical=4096 so 4Ki-native backends (LINSTOR/DRBD) and SeaBIOS both work; the separate kubelet disk is dropped. Pod/service CIDRs, dnsDomain, controlPlane endpoint and cilium k8sServiceHost are pinned to the tenant ranges / Kamaji apiserver ClusterIP to survive the DNS chicken-and-egg at bootstrap. Adds a Talos<->Kubernetes support-matrix fail() guard and drops v1.30. Removes the dead ubuntu-container-disk build chain and the orphaned copy-patch-containerd template. Co-authored-by: IvanHunters <[email protected]> Co-authored-by: Myasnikov Daniil <[email protected]> Assisted-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]> Signed-off-by: Myasnikov Daniil <[email protected]>
1 parent ccf6d9d commit 39cdc88

23 files changed

Lines changed: 1049 additions & 261 deletions

‎api/apps/v1alpha1/kubernetes/types.go‎

Lines changed: 32 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/apps/v1alpha1/kubernetes/zz_generated.deepcopy.go‎

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/apps/kubernetes/Makefile‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ include ../../../hack/package.mk
88

99
test:
1010
helm unittest .
11-
bash tests/containerd-config-path-test.sh
1211

1312
generate:
1413
cozyvalues-gen -m 'kubernetes' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/kubernetes/types.go
@@ -18,21 +17,17 @@ update:
1817
hack/update-versions.sh
1918
make generate
2019

21-
image: image-ubuntu-container-disk image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler
20+
image: image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler image-talos-csr-signer
2221

23-
image-ubuntu-container-disk:
24-
$(foreach ver,$(KUBERNETES_VERSIONS), \
25-
docker buildx build images/ubuntu-container-disk \
26-
--build-arg KUBERNETES_VERSION=$(ver) \
27-
--tag $(REGISTRY)/ubuntu-container-disk:$(ver)-$(IMAGE_TAG) \
28-
$(if $(filter 1,$(PUBLISH_VERSIONED)),--tag $(REGISTRY)/ubuntu-container-disk:$(ver)) \
29-
$(call cache-args,ubuntu-container-disk,$(ver)-buildcache) \
30-
--metadata-file images/ubuntu-container-disk-$(ver).json \
31-
$(BUILDX_ARGS) && \
32-
echo "$(REGISTRY)/ubuntu-container-disk:$(ver)-$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/ubuntu-container-disk-$(ver).json -o json -r)" \
33-
> images/ubuntu-container-disk-$(ver).tag && \
34-
rm -f images/ubuntu-container-disk-$(ver).json; \
35-
)
22+
image-talos-csr-signer:
23+
docker buildx build images/talos-csr-signer \
24+
$(call image-tags,talos-csr-signer,$(KUBERNETES_PKG_TAG)) \
25+
$(call cache-args,talos-csr-signer) \
26+
--metadata-file images/talos-csr-signer.json \
27+
$(BUILDX_ARGS)
28+
echo "$(REGISTRY)/talos-csr-signer:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/talos-csr-signer.json -o json -r)" \
29+
> images/talos-csr-signer.tag
30+
rm -f images/talos-csr-signer.json
3631

3732
image-kubevirt-cloud-provider:
3833
docker buildx build images/kubevirt-cloud-provider \

0 commit comments

Comments
 (0)