From 4cdb641e7b32126a4fd58a7014d2f6cbae782161 Mon Sep 17 00:00:00 2001 From: Hui Kang Date: Sat, 13 May 2017 22:34:27 -0400 Subject: [PATCH 1/4] Update the kubernete and docker verion in readme - kubernetes v1.6.1 - docker v1.13.1 Signed-off-by: Hui Kang --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 02bdb72a4..a545608d5 100644 --- a/README.md +++ b/README.md @@ -50,13 +50,13 @@ Note: Upstart/SysV init based OS types are not supported. Versions of supported components -------------------------------- -[kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.5.1
+[kubernetes](https://github.com/kubernetes/kubernetes/releases) v1.6.1
[etcd](https://github.com/coreos/etcd/releases) v3.0.17
[flanneld](https://github.com/coreos/flannel/releases) v0.6.2
[calicoctl](https://github.com/projectcalico/calico-docker/releases) v0.23.0
[canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
[weave](http://weave.works/) v1.8.2
-[docker](https://www.docker.com/) v1.12.5
+[docker](https://www.docker.com/) v1.13.1
[rkt](https://coreos.com/rkt/docs/latest/) v1.21.0
Note: rkt support as docker alternative is limited to control plane (etcd and From 40535027534b016595282a8e8dd8b184164e674d Mon Sep 17 00:00:00 2001 From: Gregory Storme Date: Tue, 16 May 2017 01:51:55 +0200 Subject: [PATCH 2/4] Set kube_apiserver_insecure_port parameter to use the defined variable --- roles/kubernetes-apps/ansible/tasks/main.yml | 2 +- roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml | 6 +++--- roles/kubernetes/master/handlers/main.yml | 2 +- .../master/templates/manifests/kube-apiserver.manifest.j2 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml index ed0d11f28..cd7069831 100644 --- a/roles/kubernetes-apps/ansible/tasks/main.yml +++ b/roles/kubernetes-apps/ansible/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Kubernetes Apps | Wait for kube-apiserver uri: - url: http://localhost:8080/healthz + url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz register: result until: result.status == 200 retries: 10 diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml b/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml index a2150cc70..9431ed345 100644 --- a/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml +++ b/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml @@ -38,7 +38,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: 8080 + port: {{ kube_apiserver_insecure_port }} scheme: HTTP initialDelaySeconds: 60 timeoutSeconds: 5 @@ -108,9 +108,9 @@ spec: memory: 50Mi args: - -cmd=nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1:10053 >/dev/null - - -port=8080 + - -port={{ kube_apiserver_insecure_port }} - -quiet ports: - - containerPort: 8080 + - containerPort: {{ kube_apiserver_insecure_port }} protocol: TCP dnsPolicy: Default # Don't use cluster DNS. diff --git a/roles/kubernetes/master/handlers/main.yml b/roles/kubernetes/master/handlers/main.yml index 94cec7d1b..e408ce04e 100644 --- a/roles/kubernetes/master/handlers/main.yml +++ b/roles/kubernetes/master/handlers/main.yml @@ -39,7 +39,7 @@ - name: Master | wait for the apiserver to be running uri: - url: http://localhost:8080/healthz + url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz register: result until: result.status == 200 retries: 20 diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index b0f1a2f53..6935fbfb6 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -92,7 +92,7 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 8080 + port: {{ kube_apiserver_insecure_port }} initialDelaySeconds: 30 timeoutSeconds: 10 volumeMounts: From 12069116df4da70f29a6c146a81a47a2b646e4ed Mon Sep 17 00:00:00 2001 From: Gregory Storme Date: Thu, 18 May 2017 12:44:44 +0200 Subject: [PATCH 3/4] undo changes to kubedns healthz endpoint --- roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml b/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml index 9431ed345..a2150cc70 100644 --- a/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml +++ b/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml @@ -38,7 +38,7 @@ spec: livenessProbe: httpGet: path: /healthz - port: {{ kube_apiserver_insecure_port }} + port: 8080 scheme: HTTP initialDelaySeconds: 60 timeoutSeconds: 5 @@ -108,9 +108,9 @@ spec: memory: 50Mi args: - -cmd=nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ dns_domain }} 127.0.0.1:10053 >/dev/null - - -port={{ kube_apiserver_insecure_port }} + - -port=8080 - -quiet ports: - - containerPort: {{ kube_apiserver_insecure_port }} + - containerPort: 8080 protocol: TCP dnsPolicy: Default # Don't use cluster DNS. From 661c7cec155656091548b3deef3ad814cc590036 Mon Sep 17 00:00:00 2001 From: Gregory Storme Date: Tue, 16 May 2017 01:51:55 +0200 Subject: [PATCH 4/4] Set kube_apiserver_insecure_port parameter to use the defined variable undo changes to kubedns healthz endpoint --- roles/kubernetes-apps/ansible/tasks/main.yml | 2 +- roles/kubernetes/master/handlers/main.yml | 2 +- .../master/templates/manifests/kube-apiserver.manifest.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes-apps/ansible/tasks/main.yml b/roles/kubernetes-apps/ansible/tasks/main.yml index ed0d11f28..cd7069831 100644 --- a/roles/kubernetes-apps/ansible/tasks/main.yml +++ b/roles/kubernetes-apps/ansible/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Kubernetes Apps | Wait for kube-apiserver uri: - url: http://localhost:8080/healthz + url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz register: result until: result.status == 200 retries: 10 diff --git a/roles/kubernetes/master/handlers/main.yml b/roles/kubernetes/master/handlers/main.yml index 94cec7d1b..e408ce04e 100644 --- a/roles/kubernetes/master/handlers/main.yml +++ b/roles/kubernetes/master/handlers/main.yml @@ -39,7 +39,7 @@ - name: Master | wait for the apiserver to be running uri: - url: http://localhost:8080/healthz + url: http://localhost:{{ kube_apiserver_insecure_port }}/healthz register: result until: result.status == 200 retries: 20 diff --git a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 index b0f1a2f53..6935fbfb6 100644 --- a/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 @@ -92,7 +92,7 @@ spec: httpGet: host: 127.0.0.1 path: /healthz - port: 8080 + port: {{ kube_apiserver_insecure_port }} initialDelaySeconds: 30 timeoutSeconds: 10 volumeMounts: