From 798ec9a92fd3fefc0e8e6b549dcb6282ca553234 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Thu, 1 Apr 2021 23:45:19 -0700 Subject: [PATCH] Change CNI config directory to /etc/cni/net.d * Change CNI config directory from `/etc/kubernetes/cni/net.d` to `/etc/cni/net.d` (Kubelet default) * https://github.com/poseidon/terraform-render-bootstrap/pull/255 --- aws/fedora-coreos/kubernetes/bootstrap.tf | 2 +- aws/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 4 ++-- aws/flatcar-linux/kubernetes/bootstrap.tf | 2 +- aws/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- aws/flatcar-linux/kubernetes/workers/cl/worker.yaml | 4 ++-- azure/fedora-coreos/kubernetes/bootstrap.tf | 2 +- azure/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 4 ++-- azure/flatcar-linux/kubernetes/bootstrap.tf | 2 +- azure/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- azure/flatcar-linux/kubernetes/workers/cl/worker.yaml | 4 ++-- bare-metal/fedora-coreos/kubernetes/bootstrap.tf | 2 +- bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml | 4 ++-- bare-metal/flatcar-linux/kubernetes/bootstrap.tf | 2 +- bare-metal/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- bare-metal/flatcar-linux/kubernetes/cl/worker.yaml | 4 ++-- digital-ocean/fedora-coreos/kubernetes/bootstrap.tf | 2 +- digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml | 4 ++-- digital-ocean/flatcar-linux/kubernetes/bootstrap.tf | 2 +- digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml | 4 ++-- docs/architecture/operating-systems.md | 2 +- google-cloud/fedora-coreos/kubernetes/bootstrap.tf | 2 +- google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml | 4 ++-- google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml | 4 ++-- google-cloud/flatcar-linux/kubernetes/bootstrap.tf | 2 +- google-cloud/flatcar-linux/kubernetes/cl/controller.yaml | 4 ++-- google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml | 4 ++-- 31 files changed, 51 insertions(+), 51 deletions(-) diff --git a/aws/fedora-coreos/kubernetes/bootstrap.tf b/aws/fedora-coreos/kubernetes/bootstrap.tf index 8304b4a7..fe7e600f 100644 --- a/aws/fedora-coreos/kubernetes/bootstrap.tf +++ b/aws/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/fedora-coreos/kubernetes/fcc/controller.yaml b/aws/fedora-coreos/kubernetes/fcc/controller.yaml index c41b2080..31293af0 100644 --- a/aws/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/aws/fedora-coreos/kubernetes/fcc/controller.yaml @@ -56,7 +56,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/afterburn - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -67,6 +67,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -90,7 +91,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml index c3759176..6db8f629 100644 --- a/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/aws/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -29,7 +29,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/afterburn - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -40,6 +40,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -63,7 +64,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/aws/flatcar-linux/kubernetes/bootstrap.tf b/aws/flatcar-linux/kubernetes/bootstrap.tf index 59a26348..8e4cd47a 100644 --- a/aws/flatcar-linux/kubernetes/bootstrap.tf +++ b/aws/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/aws/flatcar-linux/kubernetes/cl/controller.yaml b/aws/flatcar-linux/kubernetes/cl/controller.yaml index ae688829..31650254 100644 --- a/aws/flatcar-linux/kubernetes/cl/controller.yaml +++ b/aws/flatcar-linux/kubernetes/cl/controller.yaml @@ -59,7 +59,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/coreos - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -70,6 +70,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -90,7 +91,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml index b7927ea2..fdb8c604 100644 --- a/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/aws/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -31,7 +31,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/coreos - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -45,6 +45,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -65,7 +66,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/azure/fedora-coreos/kubernetes/bootstrap.tf b/azure/fedora-coreos/kubernetes/bootstrap.tf index f3af32d8..6323732e 100644 --- a/azure/fedora-coreos/kubernetes/bootstrap.tf +++ b/azure/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/azure/fedora-coreos/kubernetes/fcc/controller.yaml b/azure/fedora-coreos/kubernetes/fcc/controller.yaml index 6c796f78..20988a0e 100644 --- a/azure/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/azure/fedora-coreos/kubernetes/fcc/controller.yaml @@ -52,7 +52,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -63,6 +63,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -86,7 +87,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml index 9811b871..719e7fab 100644 --- a/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/azure/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -25,7 +25,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -36,6 +36,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -59,7 +60,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/azure/flatcar-linux/kubernetes/bootstrap.tf b/azure/flatcar-linux/kubernetes/bootstrap.tf index fa868e6c..7f6f97c4 100644 --- a/azure/flatcar-linux/kubernetes/bootstrap.tf +++ b/azure/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/azure/flatcar-linux/kubernetes/cl/controller.yaml b/azure/flatcar-linux/kubernetes/cl/controller.yaml index 5298eae2..0e874032 100644 --- a/azure/flatcar-linux/kubernetes/cl/controller.yaml +++ b/azure/flatcar-linux/kubernetes/cl/controller.yaml @@ -56,7 +56,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -67,6 +67,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -87,7 +88,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml index df9418ec..4b3d6747 100644 --- a/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/azure/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -28,7 +28,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -42,6 +42,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -62,7 +63,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf index 8018108a..87beb3e4 100644 --- a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf +++ b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml index 4812564f..caa9ceab 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/controller.yaml @@ -51,7 +51,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -62,6 +62,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -85,7 +86,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml b/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml index 9737e606..ab7e4265 100644 --- a/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/bare-metal/fedora-coreos/kubernetes/fcc/worker.yaml @@ -24,7 +24,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -35,6 +35,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -58,7 +59,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf index 342e12fe..d93b6305 100644 --- a/bare-metal/flatcar-linux/kubernetes/bootstrap.tf +++ b/bare-metal/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] diff --git a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml index c5c6a8a4..2dda4398 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/controller.yaml @@ -64,7 +64,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -75,6 +75,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -95,7 +96,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml index ebffa039..ca97e007 100644 --- a/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml +++ b/bare-metal/flatcar-linux/kubernetes/cl/worker.yaml @@ -36,7 +36,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -50,6 +50,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -70,7 +71,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=${domain_name} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf index 7baea942..e75f8857 100644 --- a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf +++ b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml index fdebf862..6c124221 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/controller.yaml @@ -54,7 +54,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/afterburn - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -65,6 +65,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -88,7 +89,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=$${AFTERBURN_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml index 1e227472..99ee8f1e 100644 --- a/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml +++ b/digital-ocean/fedora-coreos/kubernetes/fcc/worker.yaml @@ -28,7 +28,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/afterburn - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -39,6 +39,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -62,7 +63,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=$${AFTERBURN_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf b/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf index ee67aebd..78bb6181 100644 --- a/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf +++ b/digital-ocean/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml index 20304afd..c4d71fc5 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/controller.yaml @@ -67,7 +67,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/coreos - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -78,6 +78,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -98,7 +99,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=$${COREOS_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml index 090cd002..f28d0ed3 100644 --- a/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml +++ b/digital-ocean/flatcar-linux/kubernetes/cl/worker.yaml @@ -39,7 +39,7 @@ systemd: [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 EnvironmentFile=/run/metadata/coreos - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -53,6 +53,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -73,7 +74,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --hostname-override=$${COREOS_DIGITALOCEAN_IPV4_PRIVATE_0} \ --kubeconfig=/var/lib/kubelet/kubeconfig \ diff --git a/docs/architecture/operating-systems.md b/docs/architecture/operating-systems.md index 191a0dea..39627b70 100644 --- a/docs/architecture/operating-systems.md +++ b/docs/architecture/operating-systems.md @@ -46,7 +46,7 @@ Typhoon conventional directories. | Kubelet setting | Host location | |-------------------|--------------------------------| -| cni-conf-dir | /etc/kubernetes/cni/net.d | +| cni-conf-dir | /etc/cni/net.d | | pod-manifest-path | /etc/kubernetes/manifests | | volume-plugin-dir | /var/lib/kubelet/volumeplugins | diff --git a/google-cloud/fedora-coreos/kubernetes/bootstrap.tf b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf index 27a9b376..bb746eeb 100644 --- a/google-cloud/fedora-coreos/kubernetes/bootstrap.tf +++ b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml index ce5327e7..d41b8598 100644 --- a/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml +++ b/google-cloud/fedora-coreos/kubernetes/fcc/controller.yaml @@ -52,7 +52,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -63,6 +63,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -86,7 +87,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml index dc672ba6..a47cc876 100644 --- a/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml +++ b/google-cloud/fedora-coreos/kubernetes/workers/fcc/worker.yaml @@ -25,7 +25,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -36,6 +36,7 @@ systemd: --privileged \ --pid host \ --network host \ + --volume /etc/cni/net.d:/etc/cni/net.d:ro,z \ --volume /etc/kubernetes:/etc/kubernetes:ro,z \ --volume /usr/lib/os-release:/etc/os-release:ro \ --volume /lib/modules:/lib/modules:ro \ @@ -59,7 +60,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/google-cloud/flatcar-linux/kubernetes/bootstrap.tf b/google-cloud/flatcar-linux/kubernetes/bootstrap.tf index daff2c29..4f003bde 100644 --- a/google-cloud/flatcar-linux/kubernetes/bootstrap.tf +++ b/google-cloud/flatcar-linux/kubernetes/bootstrap.tf @@ -1,6 +1,6 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=8c2e766d180824416075f4d7a695d6291ef277ab" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=f87aa7f96a31153d5d068cbb9d849a29a27cd9ea" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] diff --git a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml index 339afdda..8463fb97 100644 --- a/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml +++ b/google-cloud/flatcar-linux/kubernetes/cl/controller.yaml @@ -56,7 +56,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -67,6 +67,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -87,7 +88,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \ diff --git a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml index df9418ec..4b3d6747 100644 --- a/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml +++ b/google-cloud/flatcar-linux/kubernetes/workers/cl/worker.yaml @@ -28,7 +28,7 @@ systemd: Wants=rpc-statd.service [Service] Environment=KUBELET_IMAGE=quay.io/poseidon/kubelet:v1.20.5 - ExecStartPre=/bin/mkdir -p /etc/kubernetes/cni/net.d + ExecStartPre=/bin/mkdir -p /etc/cni/net.d ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/bin/mkdir -p /opt/cni/bin ExecStartPre=/bin/mkdir -p /var/lib/calico @@ -42,6 +42,7 @@ systemd: --privileged \ --pid host \ --network host \ + -v /etc/cni/net.d:/etc/cni/net.d:ro \ -v /etc/kubernetes:/etc/kubernetes:ro \ -v /etc/machine-id:/etc/machine-id:ro \ -v /usr/lib/os-release:/etc/os-release:ro \ @@ -62,7 +63,6 @@ systemd: --client-ca-file=/etc/kubernetes/ca.crt \ --cluster_dns=${cluster_dns_service_ip} \ --cluster_domain=${cluster_domain_suffix} \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ --healthz-port=0 \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --network-plugin=cni \