C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3098 commits 17 branches 66 tags 141 MiB
Commit graph

3098 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antoine Legrand
0f9c289281 Merge pull request #599 from kubernetes-incubator/bug_542 
Fix kubelet deprecated options
 2016-11-15 10:50:26 +01:00
Antoine Legrand
216e0b2a52 Merge pull request #599 from kubernetes-incubator/bug_542 
Fix kubelet deprecated options
 2016-11-15 10:50:26 +01:00
Matthew Mosesohn
d98e8a4323 Merge pull request #602 from adidenko/fix-canal-ssl 
Fix etcd ssl for canal
 2016-11-15 12:43:22 +03:00
Matthew Mosesohn
ab0ff2ab3c Merge pull request #602 from adidenko/fix-canal-ssl 
Fix etcd ssl for canal
 2016-11-15 12:43:22 +03:00
Matthew Mosesohn
9f4ebdd017 Merge pull request #598 from kubernetes-incubator/bug_376 
Generate kubectl bash completion from kubectl instead of file
 2016-11-15 12:28:51 +03:00
Matthew Mosesohn
5cd65f9c45 Merge pull request #598 from kubernetes-incubator/bug_376 
Generate kubectl bash completion from kubectl instead of file
 2016-11-15 12:28:51 +03:00
Matthew Mosesohn
3a8d9cb0bc Merge pull request #604 from kubernetes-incubator/k8s-upgrade-v1.4.6 
upgrade k8s version to 1.4.6
 2016-11-15 12:27:29 +03:00
Matthew Mosesohn
4e47c267fb Merge pull request #604 from kubernetes-incubator/k8s-upgrade-v1.4.6 
upgrade k8s version to 1.4.6
 2016-11-15 12:27:29 +03:00
Spencer Smith
89d2a82213 update comment with valid options for bootstrap_os 2016-11-14 16:31:15 -05:00
Spencer Smith
cb47bbf753 update comment with valid options for bootstrap_os 2016-11-14 16:31:15 -05:00
Smana
b2d3ee2ae7 upgrade k8s version to 1.4.6 2016-11-14 21:40:05 +01:00
Smana
c41d200a95 upgrade k8s version to 1.4.6 2016-11-14 21:40:05 +01:00
Bogdan Dobrelya
27ff6bea80 Merge pull request #603 from bogdando/fix_logs 
Fix collect_info script
 2016-11-14 19:16:29 +01:00
Bogdan Dobrelya
771d537ff3 Merge pull request #603 from bogdando/fix_logs 
Fix collect_info script
 2016-11-14 19:16:29 +01:00
Matthew Mosesohn
a96f78f848 Fix kubelet deprecated options 
--api-servers now just reads kubeconfig
--config is now --pod-manifest-path

Fixes #542
 2016-11-14 22:13:44 +04:00
Matthew Mosesohn
8ca1f4ce44 Fix kubelet deprecated options 
--api-servers now just reads kubeconfig
--config is now --pod-manifest-path

Fixes #542
 2016-11-14 22:13:44 +04:00
Bogdan Dobrelya
cc1d26f939 Fix collect_info script 
Fix missing journal ctl utc key.
Rework kube* logs collection.

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
 2016-11-14 19:01:50 +01:00
Bogdan Dobrelya
625ec529ff Fix collect_info script 
Fix missing journal ctl utc key.
Rework kube* logs collection.

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
 2016-11-14 19:01:50 +01:00
Aleksandr Didenko
2b751c7d77 Fix etcd ssl for canal 
- Move CNI configuration from `kubernetes/node` role to
`network_plugin/canal`
- Create SSL dir for Canal and symlink etcd SSL files
- Add needed options to `canal-config` configmap
- Run flannel and calico-node containers with proper configuration
 2016-11-14 14:49:17 +01:00
Aleksandr Didenko
caa81f3ac2 Fix etcd ssl for canal 
- Move CNI configuration from `kubernetes/node` role to
`network_plugin/canal`
- Create SSL dir for Canal and symlink etcd SSL files
- Add needed options to `canal-config` configmap
- Run flannel and calico-node containers with proper configuration
 2016-11-14 14:49:17 +01:00
Matthew Mosesohn
9eef9afad1 Merge branch 'master' into calico-cni-container-support 2016-11-14 14:58:42 +03:00
Matthew Mosesohn
8092f57695 Merge branch 'master' into calico-cni-container-support 2016-11-14 14:58:42 +03:00
Aleksandr Didenko
12b27f4ef0 Replace calico-cni binaries with calico/cni container 
Calico CNI binaries are also released/shipped in calico/cni
container. This patch replaces download of calico CNI binaries with
calico/cni container.
 2016-11-14 12:19:58 +01:00
Aleksandr Didenko
965a1234d3 Replace calico-cni binaries with calico/cni container 
Calico CNI binaries are also released/shipped in calico/cni
container. This patch replaces download of calico CNI binaries with
calico/cni container.
 2016-11-14 12:19:58 +01:00
Matthew Mosesohn
976f095ef6 Generate kubectl bash completion from kubectl instead of file 2016-11-14 14:54:59 +04:00
Matthew Mosesohn
15bc445a9c Generate kubectl bash completion from kubectl instead of file 2016-11-14 14:54:59 +04:00
Bogdan Dobrelya
70f8780e38 Merge pull request #496 from kubernetes-incubator/idempotency_resolvconf 
Ignore changes on check resolvconf task
 2016-11-14 11:10:04 +01:00
Bogdan Dobrelya
bb72de0dc9 Merge pull request #496 from kubernetes-incubator/idempotency_resolvconf 
Ignore changes on check resolvconf task
 2016-11-14 11:10:04 +01:00
Matthew Mosesohn
80eb288a18 Merge pull request #550 from chadswen/hostname-alias 
Hostname alias fixes
 2016-11-14 13:09:18 +03:00
Matthew Mosesohn
6da0ecfa55 Merge pull request #550 from chadswen/hostname-alias 
Hostname alias fixes
 2016-11-14 13:09:18 +03:00
Matthew Mosesohn
3348434764 Merge pull request #597 from pcm32/patch-1 
Adds missing 'ip' var for terraform-generated inventory, based on internal ip
 2016-11-14 10:41:21 +03:00
Matthew Mosesohn
1ccc10baf8 Merge pull request #597 from pcm32/patch-1 
Adds missing 'ip' var for terraform-generated inventory, based on internal ip
 2016-11-14 10:41:21 +03:00
Matthew Mosesohn
220ac0d281 Merge branch 'master' into hostname-alias 2016-11-14 09:32:35 +03:00
Matthew Mosesohn
45c2900e71 Merge branch 'master' into hostname-alias 2016-11-14 09:32:35 +03:00
Matthew Mosesohn
0529bb0a58 Merge branch 'master' into idempotency_resolvconf 2016-11-14 09:30:22 +03:00
Matthew Mosesohn
eb583dd2f3 Merge branch 'master' into idempotency_resolvconf 2016-11-14 09:30:22 +03:00
Smaine Kahlouch
cda92f55b5 Merge pull request #596 from kubernetes-incubator/fix_etcd_coreos_ca 
Fix ca certificate loading on CoreOS
 2016-11-14 07:28:17 +01:00
Smaine Kahlouch
f6233ffc9a Merge pull request #596 from kubernetes-incubator/fix_etcd_coreos_ca 
Fix ca certificate loading on CoreOS
 2016-11-14 07:28:17 +01:00
Matthew Mosesohn
b141c41fee Fix ca certificate loading on CoreOS 2016-11-14 08:47:09 +04:00
Matthew Mosesohn
46ee9faca9 Fix ca certificate loading on CoreOS 2016-11-14 08:47:09 +04:00
Pablo Moreno
cdcc03b4e0 Adds missing ip based on internal ip, for etcd 2016-11-14 02:04:13 +00:00
Pablo Moreno
f320b79c0c Adds missing ip based on internal ip, for etcd 2016-11-14 02:04:13 +00:00
Matthew Mosesohn
bc75a4f12c Merge pull request #592 from artem-panchenko/support_golang_calicoctl 
Support new version of 'calicoctl' (>=v1.0.0)
 2016-11-11 13:55:24 +03:00
Matthew Mosesohn
6cc05c103a Merge pull request #592 from artem-panchenko/support_golang_calicoctl 
Support new version of 'calicoctl' (>=v1.0.0)
 2016-11-11 13:55:24 +03:00
Bogdan Dobrelya
813dd47808 Merge pull request #593 from bogdando/label_apps 
Label k8s apps, adjust collect info commands
 2016-11-10 18:09:05 +01:00
Bogdan Dobrelya
88577b9889 Merge pull request #593 from bogdando/label_apps 
Label k8s apps, adjust collect info commands
 2016-11-10 18:09:05 +01:00
Bogdan Dobrelya
3aee431750 Merge pull request #594 from adidenko/fix-calico-policy-controller 
Fix policy controller
 2016-11-10 16:15:36 +01:00
Bogdan Dobrelya
5821f9748a Merge pull request #594 from adidenko/fix-calico-policy-controller 
Fix policy controller
 2016-11-10 16:15:36 +01:00
Artem Panchenko
9d0a79a777 Support new version of 'calicoctl' (>=v1.0.0) 
Since version 'v1.0.0-beta' calicoctl is written
in Go and its API differs from old Python based
utility. Added support of both old and new version
of the utility.
 2016-11-10 17:11:29 +02:00
Artem Panchenko
c58bd33af7 Support new version of 'calicoctl' (>=v1.0.0) 
Since version 'v1.0.0-beta' calicoctl is written
in Go and its API differs from old Python based
utility. Added support of both old and new version
of the utility.
 2016-11-10 17:11:29 +02:00