diff --git a/CHANGES.md b/CHANGES.md index 41862c10..499fbde7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ Notable changes between versions. ## Latest +* Remove Kubelet flag `--network-plugin`. Unused since `docker-shim` isn't used ([#1106](https://github.com/poseidon/typhoon/pull/1106)) + ### Fedora CoreOS * Switch Kubernetes Container Runtime from `docker` to `containerd` ([#1101](https://github.com/poseidon/typhoon/pull/1101)) diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index 1ab49d5b..a6899bda 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -96,7 +96,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --provider-id=aws:///$${AFTERBURN_AWS_AVAILABILITY_ZONE}/$${AFTERBURN_AWS_INSTANCE_ID} \ diff --git a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml index cd6f7ece..279acdf3 100644 --- a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -69,7 +69,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in split(",", node_labels) ~} --node-labels=${label} \ diff --git a/aws/flatcar-linux/kubernetes/cl/controller.yaml b/aws/flatcar-linux/kubernetes/cl/controller.yaml index 2b724d40..9721d7f2 100644 --- a/aws/flatcar-linux/kubernetes/cl/controller.yaml +++ b/aws/flatcar-linux/kubernetes/cl/controller.yaml @@ -95,7 +95,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --provider-id=aws:///$${COREOS_EC2_AVAILABILITY_ZONE}/$${COREOS_EC2_INSTANCE_ID} \ diff --git a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml index e12c0165..cccef10d 100644 --- a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -70,7 +70,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in split(",", node_labels) ~} --node-labels=${label} \ diff --git a/azure/fedora-coreos/kubernetes/fcc/controller.yaml b/azure/fedora-coreos/kubernetes/fcc/controller.yaml index 42819983..07811574 100644 --- a/azure/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/azure/fedora-coreos/kubernetes/fcc/controller.yaml @@ -92,7 +92,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml index a15d09d6..c4d5c5f9 100644 --- a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -65,7 +65,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in split(",", node_labels) ~} --node-labels=${label} \ diff --git a/azure/flatcar-linux/kubernetes/cl/controller.yaml b/azure/flatcar-linux/kubernetes/cl/controller.yaml index d0d0bcbc..c5b5ea54 100644 --- a/azure/flatcar-linux/kubernetes/cl/controller.yaml +++ b/azure/flatcar-linux/kubernetes/cl/controller.yaml @@ -92,7 +92,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml index c37827d0..68e6f5d2 100644 --- a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -67,7 +67,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in split(",", node_labels) ~} --node-labels=${label} \ diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index 450d304c..e2743136 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml @@ -92,7 +92,6 @@ systemd: --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml index 6245bfc5..e959cf0d 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml @@ -65,7 +65,6 @@ systemd: --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in compact(split(",", node_labels)) ~} --node-labels=${label} \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml index 22aba3ca..9cbfe896 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml @@ -101,7 +101,6 @@ systemd: --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml index ab29d8cf..b334bc28 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml @@ -76,7 +76,6 @@ systemd: --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in compact(split(",", node_labels)) ~} --node-labels=${label} \ diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml index 199b34d2..effbd4d3 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml @@ -95,7 +95,6 @@ systemd: --healthz-port=0 \ --hostname-override=$${AFTERBURN_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml index b787d914..8026bc31 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml @@ -69,7 +69,6 @@ systemd: --healthz-port=0 \ --hostname-override=$${AFTERBURN_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml index 28dd47ba..d2cc2903 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml @@ -104,7 +104,6 @@ systemd: --healthz-port=0 \ --hostname-override=$${COREOS_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml index 0cfc3628..4f2d5de5 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml @@ -79,7 +79,6 @@ systemd: --healthz-port=0 \ --hostname-override=$${COREOS_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/docs/advanced/overview.md b/docs/advanced/overview.md index 63cff796..95c3a7c1 100644 --- a/docs/advanced/overview.md +++ b/docs/advanced/overview.md @@ -4,4 +4,5 @@ Typhoon clusters offer several advanced features for skilled users. * [ARM64](arm64.md) * [Customization](customization.md) +* [Nodes](nodes.md) * [Worker Pools](worker-pools.md) diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index a9e8f0db..be8966b6 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -92,7 +92,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --read-only-port=0 \ diff --git a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml index a15d09d6..c4d5c5f9 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -65,7 +65,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in split(",", node_labels) ~} --node-labels=${label} \ diff --git a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml index 47786035..2cc67018 100644 --- a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml @@ -92,7 +92,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/controller="true" \ --pod-manifest-path=/etc/kubernetes/manifests \ --register-with-taints=node-role.kubernetes.io/controller=:NoSchedule \ diff --git a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml index c37827d0..68e6f5d2 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -67,7 +67,6 @@ systemd: --cluster_domain=${cluster_domain_suffix} \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ - --network-plugin=cni \ --node-labels=node.kubernetes.io/node \ %{~ for label in split(",", node_labels) ~} --node-labels=${label} \