scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-07 13:54:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,351 Commits 1 Branch 0 Tags
d6e23b984cb15c88a3025569b4aa259bcc02a4a6
Commit Graph

4109 Commits

Author SHA1 Message Date
k8s-merge-robot
cb91816fc3 Merge pull request #26612 from andyzheng0831/gci-fix 
Automatic merge from submit-queue

GCI: cherry-pick the fix in PR #25670

This PR simply copies the fix in #25670 into the GCI support.

cc/ @kubernetes/goog-image @dchen1107 @roberthbailey
 2016-06-01 06:55:57 -07:00
k8s-merge-robot
0c0478e3f5 Merge pull request #26593 from bprashanth/glbc_logs 
Automatic merge from submit-queue

Collect l7 controller e2e logs

https://github.com/kubernetes/kubernetes/pull/26048#issuecomment-222758050
I meant to check e2e output and see if the logs were being collected, but it merged before i could.
 2016-06-01 06:55:54 -07:00
Marcin Wielgus
fcea41e495 Merge pull request #26577 from mwielgus/ca-0.1.1 
Bump cluster autoscaler to 0.1.1
 2016-06-01 15:41:36 +02:00
Dr. Stefan Schimanski
391ff02e4c Fix sed transformation for new kube-dns yaml 2016-06-01 13:23:16 +02:00
Liyi Meng
6c195a4923 Fix the problem in building hyperkube for 3rd party registry 2016-06-01 04:38:48 -04:00
Shaya Potter
4118bb1cf9 update heapster to beta2 - change to rest of k8s wasn't applied here 2016-06-01 00:51:52 -07:00
Andy Zheng
a47d0ce1c2 GCI: cherry-pick the fix in PR #25670 2016-05-31 21:13:15 -07:00
k8s-merge-robot
ee412efcef Merge pull request #26335 from girishkalele/kubedns-transition 
Automatic merge from submit-queue

Switch DNS addons from skydns to kubedns

Change GCI and trusty cluster-helper scripts to use kubedns instead of skydns.
 2016-05-31 16:14:48 -07:00
Jarrett Cruger
372827fd5a [fix] allow ALLOW_PRIVILEGED to be passed to kubelet and kube-api, needed for running docker in docker 2016-05-31 19:06:48 -04:00
Prashanth Balasubramanian
500bdca27c Collect l7 controller e2e logs 2016-05-31 14:44:30 -07:00
k8s-merge-robot
430bb9442a Merge pull request #26048 from bprashanth/ing_master 
Automatic merge from submit-queue

Run l7 controller on master 

Fixes https://github.com/kubernetes/kubernetes/issues/23663, needs https://github.com/kubernetes/contrib/pull/680
@roberthbailey @kubernetes/goog-cluster
 2016-05-31 13:25:47 -07:00
Girish Kalele
555b9000c3 Code review comments and corrections 2016-05-31 11:33:51 -07:00
Marcin
246f3aaebc Bump cluster autoscaler to 0.1.1 2016-05-31 20:00:00 +02:00
Marcin Wielgus
1ea5718199 Pass /etc/gce.conf to cluster autoscaler if needed 2016-05-31 19:52:30 +02:00
Marcin
74ad0def81 Add missing $ in util.sh 2016-05-31 19:41:54 +02:00
Girish Kalele
60d2293f4c Address review comments 2016-05-31 10:14:33 -07:00
Girish Kalele
4c1047d359 Switch DNS addons from skydns to kubedns 
Unified skydns templates using a simple underscore based template and
added transform sed scripts to transform into salt and sed yaml
templates

Moved all content out of cluster/addons/dns into build/kube-dns and
saltbase/salt/kube-dns
 2016-05-31 10:14:14 -07:00
k8s-merge-robot
dc8ff81f5a Merge pull request #26534 from mwielgus/scale_down_env 
Automatic merge from submit-queue

Allow to enable scale down in kube-up for gce

cc: @piosz @fgrzadkowski @jszczepkowski
 2016-05-31 04:37:11 -07:00
k8s-merge-robot
3d1b1a77e4 Merge pull request #26440 from mwielgus/remove-debug-touch 
Automatic merge from submit-queue

Remove debug from GCI cluster autoscaler setup function

cc: @piosz @fgrzadkowski
 2016-05-31 02:03:15 -07:00
Prashanth Balasubramanian
c01a0583f7 Trusty deployment 2016-05-30 15:58:03 -07:00
Prashanth Balasubramanian
f4d2334919 Add a l7 static pod 2016-05-30 15:57:42 -07:00
Marcin
0b7c2fa6fe Allow to enable scale down in kube-up for gce 2016-05-30 17:07:54 +02:00
k8s-merge-robot
1e44212890 Merge pull request #26156 from gmarek/base64 
Automatic merge from submit-queue

Change base64 -d flag to --decode flag to make it BSD compatible

cc @roberthbailey 

Fixes #25998
 2016-05-29 09:45:49 -07:00
k8s-merge-robot
7fc2e16843 Merge pull request #26442 from mwielgus/reduce-ca-request 
Automatic merge from submit-queue

Reduce cluster autoscaler request to fit into n1 master in e2e tests

cc: @piosz @fgrzadkowski @vulpecula
 2016-05-27 13:11:13 -07:00
Alex Robinson
804e36be26 Merge pull request #26157 from gmarek/poll 
Remove unused POLL_SLEEP_INTERVAL
 2016-05-27 11:30:41 -07:00
Alex Robinson
1ec7fd4e1e Merge pull request #26174 from derekwaynecarr/enable_vagrant_accounting 
Enable CPU and Memory accounting on vagrant cluster
 2016-05-27 11:25:34 -07:00
Marcin
d6cba0165a Reduce cluster autoscaler request to fit into n1 master in e2e tests 2016-05-27 20:25:25 +02:00
Marcin
e7c69f67f2 Remove debug from GCI cluster autoscaler setup function 2016-05-27 20:02:40 +02:00
Alex Robinson
7551b0ff9f Merge pull request #26150 from wojtek-t/fix_flannel_config 
Fix transient flannel etcd
 2016-05-27 10:10:38 -07:00
Alex Robinson
ba3bf90448 Merge pull request #26363 from wonderfly/fix-yaml-search-path 
GCI: Fix yaml search path
 2016-05-27 09:58:03 -07:00
derekwaynecarr
6090bc9112 Enable CPU and Memory accounting on vagrant 2016-05-27 11:21:04 -04:00
derekwaynecarr
ff07195f4e Fix vagrant issues with salt bootstrap 2016-05-27 11:21:04 -04:00
k8s-merge-robot
e7269a13ff Merge pull request #26413 from mwielgus/gci-ca 
Automatic merge from submit-queue

Support for cluster autoscaler in GCE Trusty and GCI images

Fixes: #26346
Ref: #26197

cc: @fgrzadkowski  @vulpecula @piosz @jszczepkowski
 2016-05-27 06:58:15 -07:00
Marcin
5f2695be8e Support for cluster autoscaler in GCE Trusty and GCI images 2016-05-27 12:02:20 +02:00
Alex Mohr
1dfa068055 Merge pull request #26384 from Random-Liu/disable-node-problem-detector 
Temporarily disable node-problem-detector to unblock #26351
 2016-05-26 15:53:50 -07:00
Alex Mohr
0b7614d6cd Merge pull request #26382 from dchen1107/docker 
Bump Node Image to  container-v1-3-v20160517
 2016-05-26 15:53:22 -07:00
Random-Liu
e5320c6063 Temporarily disable node-problem-detector to unblock #26351 2016-05-26 14:06:05 -07:00
Dawn Chen
16662d8fb4 Bump Node Image to container-v1-3-v20160517 2016-05-26 13:30:56 -07:00
Alex Mohr
0f3003671c Merge pull request #25963 from bryk/release-beta1 
Set Dashboard UI version to v1.1.0-beta1
 2016-05-26 12:38:48 -07:00
Alex Mohr
6b169eaa85 Merge pull request #25125 from colhom/federation-e2e 
e2e tests for federated-apiserver
 2016-05-26 10:40:30 -07:00
Daniel Wang
5cd3c01bc5 GCI: Fix yaml search path 2016-05-26 10:10:37 -07:00
Abhi Shah
965e8dce12 Merge pull request #26114 from ArtfulCoder/dnsport 
Add dnsmasq as a DNS cache in kube-dns pod
 2016-05-26 08:13:58 -07:00
k8s-merge-robot
bb38265400 Merge pull request #26238 from ihmccreery/mount-points 
Automatic merge from submit-queue

GCI-backed masters mount srv/kubernetes and srv/sshproxy in the right place

Fixes #26235.

cc @andyzheng0831
 2016-05-25 23:46:08 -07:00
Colin Hom
a092fd2dd4 Federation build and e2e test integration 
Federation components are now buildable and e2e-testable via e2e.go.
 2016-05-25 15:07:27 -07:00
Isaac Hollander McCreery
559d8b1800 Make GCI-backed masters mount srv/kubernetes and srv/sshproxy in the same place as other masters 2016-05-25 10:16:57 -07:00
k8s-merge-robot
a2de33e7ff Merge pull request #26252 from piosz/ca-0.1.0 
Automatic merge from submit-queue

Bumped Cluster Autoscaler to v0.1.0

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
 2016-05-25 01:50:39 -07:00
k8s-merge-robot
1fc5687715 Merge pull request #25784 from bprashanth/prepull 
Automatic merge from submit-queue

Prepull images in e2e 

Quick and dirty image puller because the SQ stalled multiple times just *today* on image pull flake (https://github.com/kubernetes/kubernetes/issues/25277).
@kubernetes/sig-node @kubernetes/sig-testing wdyt?
 2016-05-25 01:50:35 -07:00
Piotr Szczesniak
5e3dfdefa2 Bumped Cluster Autoscaler to v0.1.0 2016-05-25 09:38:29 +02:00
Abhishek Shah
10f9789bc3 added dnsmasq container in kubedns pod 2016-05-25 00:23:57 -07:00
Daniel Wang
3d95151971 Replace containervm with GCI as default master image for GCE clusters 2016-05-24 17:28:17 -05:00