From 4ad7b229d356ec06df43297b51370e5600d1314b Mon Sep 17 00:00:00 2001 From: Miouge1 Date: Thu, 12 Jul 2018 17:22:11 +0200 Subject: [PATCH 1/4] Include etcd and masters in adding node doc --- docs/getting-started.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting-started.md b/docs/getting-started.md index 900229964..ff21856c3 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -38,9 +38,9 @@ See more details in the [ansible guide](ansible.md). Adding nodes ------------ -You may want to add **worker** nodes to your existing cluster. This can be done by re-running the `cluster.yml` playbook, or you can target the bare minimum needed to get kubelet installed on the worker and talking to your masters. This is especially helpful when doing something like autoscaling your clusters. +You may want to add worker, master or etcd nodes to your existing cluster. This can be done by re-running the `cluster.yml` playbook, or you can target the bare minimum needed to get kubelet installed on the worker and talking to your masters. This is especially helpful when doing something like autoscaling your clusters. -- Add the new worker node to your inventory under kube-node (or utilize a [dynamic inventory](https://docs.ansible.com/ansible/intro_dynamic_inventory.html)). +- Add the new worker node to your inventory in the appropriate group (or utilize a [dynamic inventory](https://docs.ansible.com/ansible/intro_dynamic_inventory.html)). - Run the ansible-playbook command, substituting `scale.yml` for `cluster.yml`: ansible-playbook -i inventory/mycluster/hosts.ini scale.yml -b -v \ From 37ccf7e405377909f3c0b0a476dfc469c4246264 Mon Sep 17 00:00:00 2001 From: Takashi Okamoto Date: Fri, 13 Jul 2018 15:32:08 +0000 Subject: [PATCH 2/4] Fixed kubectl path. --- roles/kubernetes/kubeadm/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes/kubeadm/tasks/main.yml b/roles/kubernetes/kubeadm/tasks/main.yml index 4d16e8b26..c24f7341c 100644 --- a/roles/kubernetes/kubeadm/tasks/main.yml +++ b/roles/kubernetes/kubeadm/tasks/main.yml @@ -64,7 +64,7 @@ shell: >- {{ bin_dir }}/kubectl get configmap kube-proxy -n kube-system -o yaml | sed 's#server:.*#server:\ {{ kube_apiserver_endpoint }}#g' - | kubectl replace -f - + | {{ bin_dir }}/kubectl replace -f - delegate_to: "{{groups['kube-master']|first}}" run_once: true when: is_kube_master and kubeadm_discovery_address != kube_apiserver_endpoint From 0366600b455e0247369307ce576b59c8d2d2689c Mon Sep 17 00:00:00 2001 From: Seungkyu Ahn Date: Fri, 20 Jul 2018 07:34:33 +0000 Subject: [PATCH 3/4] Remove double slash Even without this PR, the operation works well. However, it is better to use a single slash rather than a double slash in the path. --- roles/kubernetes/kubeadm/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes/kubeadm/tasks/main.yml b/roles/kubernetes/kubeadm/tasks/main.yml index c24f7341c..d6af13fcd 100644 --- a/roles/kubernetes/kubeadm/tasks/main.yml +++ b/roles/kubernetes/kubeadm/tasks/main.yml @@ -78,7 +78,7 @@ # FIXME(mattymo): Reconcile kubelet kubeconfig filename for both deploy modes - name: Symlink kubelet kubeconfig for calico/canal file: - src: "{{ kube_config_dir }}//kubelet.conf" + src: "{{ kube_config_dir }}/kubelet.conf" dest: "{{ kube_config_dir }}/node-kubeconfig.yaml" state: link force: yes From 9b349a904989c8235c4cfb5704c50f16212e634e Mon Sep 17 00:00:00 2001 From: Alexandre Ardhuin Date: Fri, 27 Jul 2018 11:21:32 +0200 Subject: [PATCH 4/4] Fix label of registry in README --- roles/kubernetes-apps/registry/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/kubernetes-apps/registry/README.md b/roles/kubernetes-apps/registry/README.md index 81615631e..c320f2bd4 100644 --- a/roles/kubernetes-apps/registry/README.md +++ b/roles/kubernetes-apps/registry/README.md @@ -110,18 +110,18 @@ metadata: name: kube-registry-v0 namespace: kube-system labels: - k8s-app: kube-registry-upstream + k8s-app: registry version: v0 kubernetes.io/cluster-service: "true" spec: replicas: 1 selector: - k8s-app: kube-registry-upstream + k8s-app: registry version: v0 template: metadata: labels: - k8s-app: kube-registry-upstream + k8s-app: registry version: v0 kubernetes.io/cluster-service: "true" spec: @@ -164,12 +164,12 @@ metadata: name: kube-registry namespace: kube-system labels: - k8s-app: kube-registry-upstream + k8s-app: registry kubernetes.io/cluster-service: "true" kubernetes.io/name: "KubeRegistry" spec: selector: - k8s-app: kube-registry-upstream + k8s-app: registry ports: - name: registry port: 5000 @@ -257,7 +257,7 @@ You can use `kubectl` to set up a port-forward from your local node to a running Pod: ``` console -$ POD=$(kubectl get pods --namespace kube-system -l k8s-app=kube-registry-upstream \ +$ POD=$(kubectl get pods --namespace kube-system -l k8s-app=registry \ -o template --template '{{range .items}}{{.metadata.name}} {{.status.phase}}{{"\n"}}{{end}}' \ | grep Running | head -1 | cut -f1 -d' ')