From f9ed9b25fd1ebf5c77c8dcf9f27402b5a14e8154 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Fri, 14 Sep 2018 12:50:15 -0500 Subject: [PATCH 1/2] switch to crio --- .../_base/master/files/etc-sysconfig-crio-network.yaml | 6 ++++++ templates/_base/master/units/kubelet.yaml | 8 +++++--- .../_base/worker/files/etc-sysconfig-crio-network.yaml | 6 ++++++ templates/_base/worker/units/kubelet.yaml | 8 +++++--- 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 templates/_base/master/files/etc-sysconfig-crio-network.yaml create mode 100644 templates/_base/worker/files/etc-sysconfig-crio-network.yaml diff --git a/templates/_base/master/files/etc-sysconfig-crio-network.yaml b/templates/_base/master/files/etc-sysconfig-crio-network.yaml new file mode 100644 index 0000000000..91ff44b55e --- /dev/null +++ b/templates/_base/master/files/etc-sysconfig-crio-network.yaml @@ -0,0 +1,6 @@ +filesystem: "root" +mode: 0644 +path: "/etc/sysconfig/crio-network" +contents: + inline: | + CRIO_NETWORK_OPTIONS="--cni-config-dir=/etc/kubernetes/cni/net.d --cni-plugin-dir=/var/lib/cni/bin" diff --git a/templates/_base/master/units/kubelet.yaml b/templates/_base/master/units/kubelet.yaml index 5d6fcb89d5..f57a45cab3 100644 --- a/templates/_base/master/units/kubelet.yaml +++ b/templates/_base/master/units/kubelet.yaml @@ -7,16 +7,18 @@ contents: | [Service] ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests + Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m EnvironmentFile=-/etc/kubernetes/kubelet-workaround + EnvironmentFile=-/etc/kubernetes/kubelet-env ExecStart=/usr/bin/hyperkube \ kubelet \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --rotate-certificates \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ - --cni-bin-dir=/var/lib/cni/bin \ - --network-plugin=cni \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///var/run/crio/crio.sock \ + --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \ --lock-file=/var/run/lock/kubelet.lock \ --exit-on-lock-contention \ --pod-manifest-path=/etc/kubernetes/manifests \ diff --git a/templates/_base/worker/files/etc-sysconfig-crio-network.yaml b/templates/_base/worker/files/etc-sysconfig-crio-network.yaml new file mode 100644 index 0000000000..91ff44b55e --- /dev/null +++ b/templates/_base/worker/files/etc-sysconfig-crio-network.yaml @@ -0,0 +1,6 @@ +filesystem: "root" +mode: 0644 +path: "/etc/sysconfig/crio-network" +contents: + inline: | + CRIO_NETWORK_OPTIONS="--cni-config-dir=/etc/kubernetes/cni/net.d --cni-plugin-dir=/var/lib/cni/bin" diff --git a/templates/_base/worker/units/kubelet.yaml b/templates/_base/worker/units/kubelet.yaml index 41b816f4f4..bad373f82c 100644 --- a/templates/_base/worker/units/kubelet.yaml +++ b/templates/_base/worker/units/kubelet.yaml @@ -7,16 +7,18 @@ contents: | [Service] ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests + Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m EnvironmentFile=-/etc/kubernetes/kubelet-workaround + EnvironmentFile=-/etc/kubernetes/kubelet-env ExecStart=/usr/bin/hyperkube \ kubelet \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --rotate-certificates \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ - --cni-bin-dir=/var/lib/cni/bin \ - --network-plugin=cni \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///var/run/crio/crio.sock \ + --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \ --lock-file=/var/run/lock/kubelet.lock \ --exit-on-lock-contention \ --pod-manifest-path=/etc/kubernetes/manifests \ From 43db8d1699f4c731de79d201c99b8563a57aed05 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Fri, 14 Sep 2018 13:05:40 -0500 Subject: [PATCH 2/2] update test_data --- .../aws/master/files/-etc-sysconfig-crio-network | 6 ++++++ .../test_data/templates/aws/master/units/kubelet.service | 8 +++++--- .../aws/worker/files/-etc-sysconfig-crio-network | 6 ++++++ .../test_data/templates/aws/worker/units/kubelet.service | 8 +++++--- .../libvirt/master/files/-etc-sysconfig-crio-network | 6 ++++++ .../templates/libvirt/master/units/kubelet.service | 8 +++++--- .../libvirt/worker/files/-etc-sysconfig-crio-network | 6 ++++++ .../templates/libvirt/worker/units/kubelet.service | 8 +++++--- 8 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 pkg/controller/template/test_data/templates/aws/master/files/-etc-sysconfig-crio-network create mode 100644 pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysconfig-crio-network create mode 100644 pkg/controller/template/test_data/templates/libvirt/master/files/-etc-sysconfig-crio-network create mode 100644 pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-sysconfig-crio-network diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysconfig-crio-network new file mode 100644 index 0000000000..a56f445be7 --- /dev/null +++ b/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysconfig-crio-network @@ -0,0 +1,6 @@ +contents: + source: data:,CRIO_NETWORK_OPTIONS%3D%22--cni-config-dir%3D%2Fetc%2Fkubernetes%2Fcni%2Fnet.d%20--cni-plugin-dir%3D%2Fvar%2Flib%2Fcni%2Fbin%22%0A + verification: {} +filesystem: root +mode: 420 +path: /etc/sysconfig/crio-network diff --git a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service index 9d37d800c1..1607aa25e6 100644 --- a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service +++ b/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service @@ -5,16 +5,18 @@ contents: | [Service] ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests + Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m EnvironmentFile=-/etc/kubernetes/kubelet-workaround + EnvironmentFile=-/etc/kubernetes/kubelet-env ExecStart=/usr/bin/hyperkube \ kubelet \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --rotate-certificates \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ - --cni-bin-dir=/var/lib/cni/bin \ - --network-plugin=cni \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///var/run/crio/crio.sock \ + --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \ --lock-file=/var/run/lock/kubelet.lock \ --exit-on-lock-contention \ --pod-manifest-path=/etc/kubernetes/manifests \ diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysconfig-crio-network new file mode 100644 index 0000000000..a56f445be7 --- /dev/null +++ b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysconfig-crio-network @@ -0,0 +1,6 @@ +contents: + source: data:,CRIO_NETWORK_OPTIONS%3D%22--cni-config-dir%3D%2Fetc%2Fkubernetes%2Fcni%2Fnet.d%20--cni-plugin-dir%3D%2Fvar%2Flib%2Fcni%2Fbin%22%0A + verification: {} +filesystem: root +mode: 420 +path: /etc/sysconfig/crio-network diff --git a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service index d15147e225..230e2ba8a6 100644 --- a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service +++ b/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service @@ -5,16 +5,18 @@ contents: | [Service] ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests + Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m EnvironmentFile=-/etc/kubernetes/kubelet-workaround + EnvironmentFile=-/etc/kubernetes/kubelet-env ExecStart=/usr/bin/hyperkube \ kubelet \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --rotate-certificates \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ - --cni-bin-dir=/var/lib/cni/bin \ - --network-plugin=cni \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///var/run/crio/crio.sock \ + --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \ --lock-file=/var/run/lock/kubelet.lock \ --exit-on-lock-contention \ --pod-manifest-path=/etc/kubernetes/manifests \ diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-sysconfig-crio-network new file mode 100644 index 0000000000..a56f445be7 --- /dev/null +++ b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-sysconfig-crio-network @@ -0,0 +1,6 @@ +contents: + source: data:,CRIO_NETWORK_OPTIONS%3D%22--cni-config-dir%3D%2Fetc%2Fkubernetes%2Fcni%2Fnet.d%20--cni-plugin-dir%3D%2Fvar%2Flib%2Fcni%2Fbin%22%0A + verification: {} +filesystem: root +mode: 420 +path: /etc/sysconfig/crio-network diff --git a/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service index 06b106f3f9..ab1cd1a3db 100644 --- a/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service +++ b/pkg/controller/template/test_data/templates/libvirt/master/units/kubelet.service @@ -5,16 +5,18 @@ contents: | [Service] ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests + Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m EnvironmentFile=-/etc/kubernetes/kubelet-workaround + EnvironmentFile=-/etc/kubernetes/kubelet-env ExecStart=/usr/bin/hyperkube \ kubelet \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --rotate-certificates \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ - --cni-bin-dir=/var/lib/cni/bin \ - --network-plugin=cni \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///var/run/crio/crio.sock \ + --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \ --lock-file=/var/run/lock/kubelet.lock \ --exit-on-lock-contention \ --pod-manifest-path=/etc/kubernetes/manifests \ diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-sysconfig-crio-network new file mode 100644 index 0000000000..a56f445be7 --- /dev/null +++ b/pkg/controller/template/test_data/templates/libvirt/worker/files/-etc-sysconfig-crio-network @@ -0,0 +1,6 @@ +contents: + source: data:,CRIO_NETWORK_OPTIONS%3D%22--cni-config-dir%3D%2Fetc%2Fkubernetes%2Fcni%2Fnet.d%20--cni-plugin-dir%3D%2Fvar%2Flib%2Fcni%2Fbin%22%0A + verification: {} +filesystem: root +mode: 420 +path: /etc/sysconfig/crio-network diff --git a/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service index fe43c17131..6faf0ccf01 100644 --- a/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service +++ b/pkg/controller/template/test_data/templates/libvirt/worker/units/kubelet.service @@ -5,16 +5,18 @@ contents: | [Service] ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests + Environment=KUBELET_RUNTIME_REQUEST_TIMEOUT=10m EnvironmentFile=-/etc/kubernetes/kubelet-workaround + EnvironmentFile=-/etc/kubernetes/kubelet-env ExecStart=/usr/bin/hyperkube \ kubelet \ --bootstrap-kubeconfig=/etc/kubernetes/kubeconfig \ --kubeconfig=/var/lib/kubelet/kubeconfig \ --rotate-certificates \ - --cni-conf-dir=/etc/kubernetes/cni/net.d \ - --cni-bin-dir=/var/lib/cni/bin \ - --network-plugin=cni \ + --container-runtime=remote \ + --container-runtime-endpoint=unix:///var/run/crio/crio.sock \ + --runtime-request-timeout=${KUBELET_RUNTIME_REQUEST_TIMEOUT} \ --lock-file=/var/run/lock/kubelet.lock \ --exit-on-lock-contention \ --pod-manifest-path=/etc/kubernetes/manifests \