diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 000000000..499e63710 Binary files /dev/null and b/.DS_Store differ diff --git a/practice/flannel-installation.md b/practice/flannel-installation.md index 89c814c02..e97203e04 100644 --- a/practice/flannel-installation.md +++ b/practice/flannel-installation.md @@ -24,8 +24,8 @@ Type=notify EnvironmentFile=/etc/sysconfig/flanneld EnvironmentFile=-/etc/sysconfig/docker-network ExecStart=/usr/bin/flanneld-start \ - -etcd-endpoints=${ETCD_ENDPOINTS} \ - -etcd-prefix=${ETCD_PREFIX} \ + -etcd-endpoints=${FLANNEL_ETCD_ENDPOINTS} \ + -etcd-prefix=${FLANNEL_ETCD_PREFIX} \ $FLANNEL_OPTIONS ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker Restart=on-failure @@ -41,11 +41,11 @@ RequiredBy=docker.service # Flanneld configuration options # etcd url location. Point this to the server where etcd runs -ETCD_ENDPOINTS="https://172.20.0.113:2379,https://172.20.0.114:2379,https://172.20.0.115:2379" +FLANNEL_ETCD_ENDPOINTS="https://172.20.0.113:2379,https://172.20.0.114:2379,https://172.20.0.115:2379" # etcd config key. This is the configuration key that flannel queries # For address range assignment -ETCD_PREFIX="/kube-centos/network" +FLANNEL_ETCD_PREFIX="/kube-centos/network" # Any additional options that you want to pass FLANNEL_OPTIONS="-etcd-cafile=/etc/kubernetes/ssl/ca.pem -etcd-certfile=/etc/kubernetes/ssl/kubernetes.pem -etcd-keyfile=/etc/kubernetes/ssl/kubernetes-key.pem" diff --git a/practice/master-installation.md b/practice/master-installation.md index dbe14180f..c2cef3e0f 100644 --- a/practice/master-installation.md +++ b/practice/master-installation.md @@ -301,6 +301,7 @@ KUBE_SCHEDULER_ARGS="--leader-elect=true --address=127.0.0.1" systemctl daemon-reload systemctl enable kube-scheduler systemctl start kube-scheduler +systemctl status kube-scheduler ``` ## 验证 master 节点功能 diff --git a/systemd/flanneld.service b/systemd/flanneld.service index 968e4ea16..d6ecf1343 100644 --- a/systemd/flanneld.service +++ b/systemd/flanneld.service @@ -10,7 +10,10 @@ Before=docker.service Type=notify EnvironmentFile=/etc/sysconfig/flanneld EnvironmentFile=-/etc/sysconfig/docker-network -ExecStart=/usr/bin/flanneld-start $FLANNEL_OPTIONS +ExecStart=/usr/bin/flanneld-start \ + -etcd-endpoints=${FLANNEL_ETCD_ENDPOINTS} \ + -etcd-prefix=${FLANNEL_ETCD_PREFIX} \ + $FLANNEL_OPTIONS ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker Restart=on-failure