Skip to content

Commit 10e57a3

Browse files
committed
remove uncompatible flag for v1.15 from config
1 parent 05f29d1 commit 10e57a3

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

conf/config

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ KUBE_LOGTOSTDERR="--logtostderr=true"
1616
KUBE_LOG_LEVEL="--v=0"
1717

1818
# Should this cluster be allowed to run privileged docker containers
19-
KUBE_ALLOW_PRIV="--allow-privileged=true"
19+
# This flog is not compatible with Kubernetes v1.15
20+
#KUBE_ALLOW_PRIV="--allow-privileged=true"
2021

2122
# How the controller-manager, scheduler, and proxy find the apiserver
2223
KUBE_MASTER="--master=http://172.17.8.101:8080"

node1/kubelet

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ KUBELET_HOSTNAME="--hostname-override=node1"
1818
KUBELET_POD_INFRA_CONTAINER="--pod-infra-container-image=jimmysong/pause-amd64:3.0"
1919
#
2020
## Add your own!
21-
KUBELET_ARGS="--runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --cgroup-driver=systemd --cluster-dns=10.254.0.2 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --cert-dir=/etc/kubernetes/ssl --cluster-domain=cluster.local --hairpin-mode promiscuous-bridge --serialize-image-pulls=false --allow-privileged=true"
21+
KUBELET_ARGS="--runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --cgroup-driver=systemd --cluster-dns=10.254.0.2 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --cert-dir=/etc/kubernetes/ssl --cluster-domain=cluster.local --hairpin-mode promiscuous-bridge --serialize-image-pulls=false"

node2/kubelet

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ KUBELET_HOSTNAME="--hostname-override=node2"
1919
KUBELET_POD_INFRA_CONTAINER="--pod-infra-container-image=jimmysong/pause-amd64:3.0"
2020
#
2121
## Add your own!
22-
KUBELET_ARGS="--runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --cgroup-driver=systemd --cluster-dns=10.254.0.2 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --cert-dir=/etc/kubernetes/ssl --cluster-domain=cluster.local --hairpin-mode promiscuous-bridge --serialize-image-pulls=false --allow-privileged=true"
22+
KUBELET_ARGS="--runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --cgroup-driver=systemd --cluster-dns=10.254.0.2 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --cert-dir=/etc/kubernetes/ssl --cluster-domain=cluster.local --hairpin-mode promiscuous-bridge --serialize-image-pulls=false"

node3/kubelet

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ KUBELET_HOSTNAME="--hostname-override=node3"
1818
KUBELET_POD_INFRA_CONTAINER="--pod-infra-container-image=jimmysong/pause-amd64:3.0"
1919
#
2020
## Add your own!
21-
KUBELET_ARGS="--runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --cgroup-driver=systemd --cluster-dns=10.254.0.2 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --cert-dir=/etc/kubernetes/ssl --cluster-domain=cluster.local --hairpin-mode promiscuous-bridge --serialize-image-pulls=false --allow-privileged=true"
21+
KUBELET_ARGS="--runtime-cgroups=/systemd/system.slice --kubelet-cgroups=/systemd/system.slice --cgroup-driver=systemd --cluster-dns=10.254.0.2 --bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --cert-dir=/etc/kubernetes/ssl --cluster-domain=cluster.local --hairpin-mode promiscuous-bridge --serialize-image-pulls=false"

0 commit comments

Comments
 (0)