github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
15,172 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

1926 Commits (6656f4d05148d6194ae1bb635732892337d34750)

Author SHA1 Message Date
Justin Santa Barbara fca7822800 Misc (non-code) spelling fixes 2015-07-04 10:39:37 -04:00
Justin Santa Barbara 1ece037555 Spelling fix (in code): octects -> octets 2015-07-04 10:37:57 -04:00
Alex Robinson 4bfbd5f553 Add limits to the fluentd buffer size. 2015-07-03 23:24:08 +00:00
Justin Santa Barbara 6504df77f1 Salt: install socat; needed for port-forward 
port-forward needs socat on the node hosts; we technically
don't need it today on the master, but this seems the right
place to put it, and socat is a small dependency.
 2015-07-03 19:12:44 -04:00
Justin Santa Barbara 25007421ba Salt: re-remove comment block 
It had been removed in upstream, but had been kept by mistake here.
 2015-07-03 12:43:36 -04:00
Justin Santa Barbara 600a0d6fe7 Salt: have kube-addons service depend on init file 
For symmetry with systemd
 2015-07-03 12:41:59 -04:00
Justin Santa Barbara a5b3c73ac4 Salt: Add service block for kube-proxy for systemd 
We have the workaround for Salt's problems here, but we should still express
our intent.
 2015-07-03 10:26:21 -04:00
Justin Santa Barbara 60d822435b Salt: clean daemon_args on RedHat, not systemd 
I don't think it actually makes a difference based on how we're using it,
but this is now more of a precise change.
 2015-07-03 10:24:32 -04:00
Justin Santa Barbara ad0293e3f3 Salt: Add more dependencies to systemd services 
This may help Salt reload services correctly, although we still
need the script until Salt's bug with reloading services on systemd
is resolved.

Salt bug: https://github.com/saltstack/salt/issues/16778
 2015-07-03 01:40:15 -04:00
Justin Santa Barbara 944fc1ed58 Set standard bash options in services helper script 2015-07-03 01:40:15 -04:00
Justin Santa Barbara bcd92c7522 Salt: support systemd (don't assume Redhat <=> systemd) 
Also work around problems with Salt & systemd services, in particular
that Salt doesn't issue a daemon-reload.
 2015-07-03 01:40:15 -04:00
Justin Santa Barbara c676c11189 AWS: Configure SSL certificate alternate-names 
GCE does this in its per-provider scripts; this does the same for AWS and lets
other providers do the same; I believe kube2sky requires 10.0.0.1 as a SAN.
 2015-07-03 01:18:07 -04:00
Karl Isenberg 0229cb01fc Move sourcing of provider-specific util.sh into kube-util.sh 
- kube-util.sh defines default implementations
- provider util.sh overrides the default implementations as desired
- default kube-util functions now print to stderr to avoid affecting
  captured output
 2015-07-02 12:50:18 -07:00
Dawn Chen 9ce11545c0 Explicitly configure master component containers and nginx with 200m each. 2015-07-02 10:46:39 -07:00
Arsen Mamikonyan 38c3bdfa45 Do not override environment variable in ubuntu defaults and ubuntu/build.sh 2015-07-02 13:10:54 +01:00
Zach Loafman 1d16be675c Merge pull request #10653 from dchen1107/resource_management 
Set resource limit for addon containers
 2015-07-01 19:35:28 -07:00
Dawn Chen 54531d9b55 Set memory limit (200mi) to fluentd static pod 2015-07-01 17:00:06 -07:00
Dawn Chen 6b61918b67 Set resource limit for both elasticsearch and kibana containers based on data collected by #10335 2015-07-01 16:01:09 -07:00
Zach Loafman b60c8e567f Merge pull request #10077 from timstclair/ui-server 
Move dashboard UI out of the apiserver to a separate pod
 2015-07-01 15:56:33 -07:00
Zach Loafman e5670c104d Merge pull request #10604 from nikhiljindal/v1 
Updating scripts to use v1 instead of v1beta3
 2015-07-01 15:54:17 -07:00
Zach Loafman b27a8e1d90 Merge pull request #10606 from nikhiljindal/testsToV1 
Update tests/examples to v1
 2015-07-01 15:53:54 -07:00
Zach Loafman e3e024da10 Merge pull request #10614 from justinsb/aws_ssh_fingeprint 
AWS: Use the SSH key fingerprint, not the AWS fingerprint
 2015-07-01 15:53:31 -07:00
Dawn Chen ce520dd6e8 Set resource limit for skydns containers based on data collected by #10335 2015-07-01 14:47:29 -07:00
Dawn Chen 4f2d22263e Set resource limit for both heapster and influxdb container based on data collected 
by #10335. Please noted that both influxdb and heapster could be oom-killed due to
memory leakage here.
 2015-07-01 14:39:10 -07:00
nikhiljindal 274792d7bb Stop exposing v1beta3 by default 2015-07-01 14:38:02 -07:00
Tim St. Clair b6b2d6df42 Add kube-ui cluster addon for serving k8s dashboard UI. 
Changes include:
- Add kube-ui binary for serving static dashboard UI
- Add kube-ui docker image, replication controller, and service
- Make the kube-ui a cluster-addon (enabled by default)
- Split the compiled pkg/ui/datafile.go into separate dashboard and swagger packages
- Update docs to reflect changes
 2015-07-01 14:21:47 -07:00
Zach Loafman 30cc467159 Merge pull request #10634 from mikedanese/fix-ca-logs 
fix heapster google configs so that heapster has a CA cert for googleapis
 2015-07-01 14:14:06 -07:00
Alex Robinson e5ea6ae854 Run fluentd on the master node by default. 
This involves adding the logging-write scope to the master when running on GCE.
 2015-07-01 20:07:52 +00:00
Alex Robinson 8855371763 Configure fluentd to collect additional log files, including master log files. 
This also merges the output blocks together because there's no compelling
reason to have a separate output block for each input.
 2015-07-01 20:07:47 +00:00
Marek Biskup 8df3a9cae8 namespaces in addon update 2015-07-01 21:31:52 +02:00
Mike Danese 6ecddd9290 fix heapster configs so that heapster has a CA cert for googleapis 2015-07-01 11:26:30 -07:00
Maru Newby 40632d3bf6 Vagrant: Allow env override of IP addresses 
MASTER_IP and MINION_IP_BASE are hard-coded in vagrant's
config-default.sh, and the values correspond to virtualbox's default
subnet.  On hosts that have both virtualbox and another provider
installed, attempting to deploy kubernetes with the non-virtualbox
provider is likely to result in broken networking.  This change allows
the addresses to be overridden via the environment so that more
appropriate values can be used.
 2015-07-01 10:20:12 -07:00
Zach Loafman 3094c1624b Merge pull request #10492 from derekwaynecarr/add_watch_service_file 
Fix Vagrant kube-up - missed file watch on systemd stops kubelet starting on initial kube-up
 2015-07-01 09:49:59 -07:00
Zach Loafman bd12aefdf2 Merge pull request #10237 from marekbiskup/addon-update-do-not-retry-too-long 
addon updater should not retry too many times - specs may be invalid
 2015-07-01 08:52:02 -07:00
Zach Loafman 502103cdc6 Merge pull request #10453 from satnam6502/fix-es 
Change port names to avoid validation failure
 2015-07-01 08:30:28 -07:00
Marek Biskup 7873e252f0 addon updater should not retry too many times because specs may be invalid 2015-07-01 16:22:32 +02:00
derekwaynecarr de78898170 Missing file watch on systemd stops kubelet starting on kube-up 2015-07-01 09:59:26 -04:00
Zach Loafman b83236ee7a Merge pull request #10568 from derekwaynecarr/fix_vagrant_kube_proxy 
Missed update to kube-proxy when removing nginx on vagrant
 2015-07-01 06:42:00 -07:00
Zach Loafman ffeb982064 Merge pull request #10528 from dchen1107/cleanup 
Persistent influxdb data to directory on local host.
 2015-07-01 06:41:24 -07:00
Justin Santa Barbara 2a8d46864b AWS: Use the SSH key fingerprint, not the AWS fingerprint 
This is unfortunate, because it means we have two fingerprints,
although arguably the OpenSSH key fingerprint is much more common.
However, the OSX Mavericks version of ssh-keygen can't compute
the AWS fingerprint correctly (e.g. https://www.netmeister.org/blog/ssh2pkcs8.html)

So we work on OSX Mavericks, we use the more common OpenSSH fingerprint.
 2015-07-01 04:10:48 -07:00
nikhiljindal 2e9e46dd08 Updating scripts to use v1 instead of v1beta3 2015-07-01 00:23:16 -07:00
Dawn Chen ff17623742 Persistent influxdb data to directory on local host. 2015-06-30 22:08:40 -07:00
Maru Newby 2da59a2f34 Install 'docker' package for Fedora 22 
Fedora < 22 provides docker via the 'docker-io' package, but this
package was renamed to 'docker' as of Fedora 22.  Though the docker
package can be installed manually with 'dnf install docker-io' on F22,
Salt requires the explicit package name or deployment will fail.
 2015-06-30 21:36:33 -07:00
Robert Bailey fedddee157 Install the kubectl binary on nodes in addition to the master. 2015-06-30 16:52:17 -07:00
derekwaynecarr 2cc869b1c5 Missed update to kube-proxy when removing nginx on vagrant 2015-06-30 15:42:52 -04:00
Dawn Chen e55cd709a1 Removed cluster/saltbase/salt/_states/container_bridge.py since it is useless now. 2015-06-30 11:00:41 -07:00
Satnam Singh 4e58e001da Change port names to avoid validation failure 2015-06-30 10:56:20 -07:00
Shaun Stanworth 74bb1b349a Respect DNS_DOMAIN setting in AWS+CoreOS 
Without this change, CoreOS minion nodes are unable to perform short-name DNS lookups by default, as the default value for `DNS_DOMAIN` is `cluster.local`, which doesn't match the hard-coded value here.
 2015-06-30 17:48:15 +01:00
Zach Loafman f21b6b89d1 Fix issues mentioned in #10520 2015-06-30 06:51:10 -07:00
Daniel Smith dcd91666b9 wait until a token shows up to start addons 2015-06-29 18:41:12 -07:00
Alex Robinson af533b2b2a Merge pull request #10275 from ddysher/ubuntu-flannel 
Ubuntu cluster: run flannel on master
 2015-06-29 16:30:31 -07:00
Alex Robinson ac917aa36a Merge pull request #10402 from justinsb/docker_pkg_require_download 
Add explicit dependency of docker pkg on the deb download
 2015-06-29 16:10:53 -07:00
Alex Robinson 799c0a09e0 Merge pull request #10369 from mikedanese/heapster-in-cluster-config 
bump heapster addon version to use inClusterConfig
 2015-06-29 10:56:50 -07:00
Justin Santa Barbara e29e9f0033 Add explicit dependency of docker pkg on the deb download 
Salt ordering continues to surprise me.  I saw them execute
out of order, though I don't know why.  Adding an explicit
dependency to prevent out-of-order execution.
 2015-06-28 23:51:12 -04:00
Justin Santa Barbara ea74bd13b8 Work around Salt 18089 
Directly create /etc/sysctl.d/99-salt.conf
 2015-06-28 23:50:00 -04:00
Robert Bailey 1c0b765df6 Merge pull request #10359 from justinsb/aws_fix_options 
Fix AWS options doc
 2015-06-26 23:16:51 -07:00
Robert Bailey e6f14a21ce Merge pull request #10403 from justinsb/ebs-for-master-data-2 
AWS: Use persistent disk on master
 2015-06-26 21:52:10 -07:00
Robert Bailey ad12c98e6d Merge pull request #10150 from thockin/kube2sky-with-token-fix 
Make DNS not need its own token
 2015-06-26 18:17:03 -07:00
Robert Bailey 017a43702a Merge pull request #10400 from justinsb/fix_10379 
Don't make kubelet systemd service depend on Docker
 2015-06-26 17:12:51 -07:00
Dawn Chen 1a4d3ef680 Revert "Set resource limit for both heapster and influxdb container based on" 2015-06-26 15:45:26 -07:00
Mike Danese bfc80095d4 bump heapster addon version to use inClusterConfig 2015-06-26 15:43:32 -07:00
Robert Bailey ffb846a284 Merge pull request #10375 from eparis/enable_node_monitoring 
Remove unused enable_node_monitoring
 2015-06-26 12:58:14 -07:00
Robert Bailey 91589143a3 Merge pull request #10370 from mikedanese/no-more-machines 
remove --machines and related deprecated flags from code and docs
 2015-06-26 10:54:01 -07:00
Robert Bailey 0048eae8eb Merge pull request #9965 from stevekuznetsov/skuznets/allow-https 
Allowing for HTTPS Probes
 2015-06-26 10:43:37 -07:00
Justin Santa Barbara a3cb84fa56 AWS: Wait for disk to be attached in setup-master-pd.sh 2015-06-26 11:52:45 -04:00
Justin Santa Barbara 6e09cd3ffd AWS: Create/reuse master pd directly 2015-06-26 11:52:45 -04:00
Justin Santa Barbara 0a4f03f235 AWS: Mount ephemeral on /mnt/ephemeral 
If we're going to have a persistent disk on /mnt/master-pd, it seems risky
sometimes to have /mnt be a mounted volume.

A new consistent approach: we mount volumes under /mnt/<name>.
 2015-06-26 11:52:45 -04:00
Justin Santa Barbara 7059f379a4 AWS: Mount persistent disk as sdb on master 2015-06-26 11:52:44 -04:00
Adam Sunderland 66e0c5432f Use EBS for Master Data 
Signed-off-by: Adam Sunderland <iterion@gmail.com>
 2015-06-26 11:52:44 -04:00
Justin Santa Barbara 3ef028148d Fix AWS options doc 
Fix formatting, and ZONE should have been KUBE_AWS_ZONE.
 2015-06-26 11:16:44 -04:00
Justin Santa Barbara 54d3ac92ea Don't make kubelet systemd service depend on Docker 
Fixes #10379
 2015-06-26 11:03:09 -04:00
Mike Danese 1e130e0794 remove --machines from code and docs 2015-06-25 18:29:11 -07:00
Eric Paris 58df58f3d7 Remove unused enable_node_monitoring option 
Back in 1a7f7245e7 we dropped the one
place this was used, but left all of the variable and definitions and
garbage around cluster/
 2015-06-25 20:57:56 -04:00
Tim Hockin 6757a1ce94 Use the svc.cluster.local name for DNS health checks 2015-06-25 17:11:53 -07:00
Tim Hockin 07e75c1dec Use v1 API 2015-06-25 17:04:47 -07:00
Tim Hockin 1ce7f1b5be Stop using special tokens for DNS 2015-06-25 17:04:47 -07:00
Tim Hockin 2b4da35499 Make kube2sky fall back on service accounts 
Service accounts are as yet unverified (no CA cert) but at least it will work.
 2015-06-25 17:04:47 -07:00
Tim Hockin 88ce0ad8e9 Clean up Changelog 
- sort newest-first
- add missing entry
- format consistently
 2015-06-25 17:04:47 -07:00
Brendan Burns 74806a1047 Merge pull request #10296 from thockin/eol-registry-cache 
EOL Google's registry caching mirror
 2015-06-25 14:52:27 -07:00
Maxwell Forbes bc1930927d Merge pull request #10347 from justinsb/vagrant_no_cidr_on_master 
Salt: don't assume that master => cbr-cidr
 2015-06-25 10:23:59 -07:00
Maxwell Forbes 655179dcfb Merge pull request #10264 from mikedanese/ca-token 
add ca cert to token controller and all service accounts
 2015-06-25 09:56:35 -07:00
Steve Kuznetsov d581d1f6c0 Fixed typo in gce-specific kube-up script 2015-06-25 12:51:34 -04:00
Justin Santa Barbara a0ae1d90ba Salt: don't assume that master => cbr-cidr 
In particular, this is required for vagrant
 2015-06-25 09:17:00 -04:00
Brendan Burns d2334d60c8 Merge pull request #10328 from dchen1107/cleanup 
Add dependencies on docker and kubelet service when copying master co…
 2015-06-24 21:32:35 -07:00
Dawn Chen e7d217d941 Add dependencies on docker and kubelet service when copying master components manifests 
to /etc/kubernetes/manifest
 2015-06-24 21:15:08 -07:00
Maxwell Forbes 3afda5d566 Merge pull request #10312 from dchen1107/cleanup 
Take 2: Fix the race between configuring cbr0 and restarting static pods
 2015-06-24 17:59:50 -07:00
Mike Danese 56bde3342a add ca to token controller and all service accounts 2015-06-24 15:10:20 -07:00
Maxwell Forbes 244c2f7b90 Merge pull request #10236 from derekwaynecarr/remove_nginx 
Remove nginx from vagrant configuration
 2015-06-24 13:21:59 -07:00
Dawn Chen 6ddfa512de Revert "Revert "Fix the race between configuring cbr0 and restarting static pods"" 
This reverts commit fd0a95dd12.
 2015-06-24 11:10:10 -07:00
Tim Hockin 280f99afd9 EOL our registry caching mirror 
Docker's v1 registry has gotten slower and slower, and they have no
interest in fixing it.  Using a mirror forces v1 mode.  Measurements
show that v1 with our mirror is slower than v2 with docker's registry in
just about all metrics.
 2015-06-24 09:56:59 -07:00
Piotr Szczesniak fd0a95dd12 Revert "Fix the race between configuring cbr0 and restarting static pods" 2015-06-24 09:56:49 +02:00
Deyuan Deng 6f765708ad Ubuntu cluster: properly formatting shell scripts 2015-06-23 23:07:23 -04:00
Deyuan Deng 09a274a7a5 Ubuntu cluster: run flannel on master 2015-06-23 23:07:17 -04:00
Jeff Lowdermilk 50d50a3cb8 Merge pull request #10211 from dchen1107/cleanup 
Fix the race between configuring cbr0 and restarting static pods
 2015-06-23 17:09:01 -07:00
Dawn Chen 9dbe6fe4e4 Added more comments. 2015-06-23 16:28:41 -07:00
Jeff Lowdermilk c1a7055701 Merge pull request #10260 from dchen1107/clean 
Set resource limit for both heapster and influxdb container based on
 2015-06-23 15:57:53 -07:00
Dawn Chen e0186c3bd0 Set resource limit for both heapster and influxdb container based on 
data collected by #5880
 2015-06-23 14:28:51 -07:00
Dawn Chen 8d76d4ee57 Make master-addon service depend on both docker and kubelet service 
in salt.
 2015-06-23 12:11:20 -07:00
Dawn Chen 23200d303f Fix several issues on running syncPods until network is configured. 
Also fixed unittests and compiling.
 2015-06-23 12:11:19 -07:00
Jeff Lowdermilk e2d496e45d Merge pull request #9737 from iterion/use-openssl-rsa 
AWS: Use RSA to Generate Fingerprint
 2015-06-23 10:14:27 -07:00
derekwaynecarr db202d4904 Remove nginx from vagrant 2015-06-23 13:07:50 -04:00
Jeff Lowdermilk a2ce3ea529 Merge pull request #10107 from roberthbailey/sans 
Add more SANs to the master certificate.
 2015-06-23 08:22:33 -07:00
Brendan Burns 192ffdfb25 Fix the container bridge so that it can create cbr0 
Fix the kubelet so that it tries to sync status, even if Docker is down
 2015-06-22 23:18:01 -07:00
Brendan Burns a29ade2f33 Disable creation of cbr0, the kubelet does it now. 
Conditionalize the docker bridge.
 2015-06-22 23:15:29 -07:00
Satnam Singh cb9f7d17f5 Add readiness probes to Elasticsearch and Kibana logging 2015-06-22 12:40:15 -07:00
Jeff Lowdermilk 85770295c2 Merge pull request #10004 from ArtfulCoder/kubelet_health 
Augmented kubelet healthz with syncLoop check.
 2015-06-22 10:53:05 -07:00
Zach Loafman 1559fa8b7e Merge pull request #10140 from brendandburns/rev-etcd 
rev etcd to 2.0.12
 2015-06-22 10:32:19 -07:00
Max Forbes 434f968715 GKE upgrade tests 2015-06-20 09:44:19 -07:00
Abhishek Shah 3556993179 Augmented kubelet healthz with syncLoop check. 
Monit uses read-only port for health monitoring.
 2015-06-19 18:14:01 -07:00
Brendan Burns ec1e308ae2 rev etcd to 2.0.12 2015-06-19 15:57:32 -07:00
Vishnu Kannan 3800fe1884 Updating heapster to v0.14.3. 2015-06-19 13:30:50 -07:00
Robert Bailey 6ede5a90b1 Add more SANs to the master certificate. 2015-06-19 13:06:18 -07:00
Satnam Singh f83d5356d7 Merge pull request #9987 from mbforbes/livingUpgrade 
Node upgrade test
 2015-06-19 10:02:52 -07:00
Satnam Singh a45ddb69d2 Merge pull request #10073 from rajatchopra/vagrant_network 
fix vagrant networking
 2015-06-19 07:51:27 -07:00
Justin Santa Barbara 2a5ed2f086 AWS: Use auto-scaling group to run minions 
This uses the dynamic CIDR work, and we set source-dest-check to false
when we configure the route (which kind-of makes sense)
 2015-06-19 10:22:15 -04:00
Marek Biskup dfb702a6e4 addon doc improved 2015-06-19 11:14:01 +02:00
Rajat Chopra d0816be55d fix vagrant networking 2015-06-18 17:48:32 -07:00
Satnam Singh 9f32599bee Merge pull request #9720 from justinsb/aws_routes 
Refactor Routes, and dynamically configure minion CIDRs on AWS
 2015-06-18 17:16:29 -07:00
Satnam Singh b8b8f4d659 Merge pull request #10053 from timstclair/gcloud-docker 
s/gcloud preview docker/gcloud docker/
 2015-06-18 16:12:20 -07:00
Max Forbes 2803fbe343 Node upgrade tests. 2015-06-18 15:59:51 -07:00
Justin Santa Barbara a4e15cdf3e AWS: Configure minion routes dynamically 
We need to implement the Routes interface, and then enable the functionality in the cluster scripts.
 2015-06-18 14:59:37 -07:00
Satnam Singh 34fb2a9f2d Merge pull request #9859 from mwielgus/resources-check 
Check for existing GCE resources in kube-up
 2015-06-18 14:47:22 -07:00
Satnam Singh 087b6e32e3 Merge pull request #10005 from ZJU-SEL/Fix9237 
Hot fix for ubuntu k8s
 2015-06-18 14:23:07 -07:00
Satnam Singh 55f791ca15 Merge pull request #10050 from zmerlynn/checkbinaries 
Validate binaries downloaded from GCS:
 2015-06-18 14:14:56 -07:00
Satnam Singh a016f7d4ef Merge pull request #10063 from jlowdermilk/gke-e2e 
Fix a few e2e references to allow gke to test dogfood builds
 2015-06-18 13:49:17 -07:00
Jeff Lowdermilk e72431033a Fix a few e2e references to allow gke to test dogfood builds 2015-06-18 13:39:51 -07:00
Zach Loafman d8da39ecd0 Validate binaries downloaded from GCS: 
* Set SHA1 for Kubernetes server binary and Salt tar in kube-env.
* Check SHA1 in configure-vm.sh. If the env variable isn't available,
download the SHA1 from GCS and double check that.
* Fixes a bug in the devel path where we were actually uploading the
wrong sha1 to the bucket.

Fixes #10021
 2015-06-18 13:37:05 -07:00
Brendan Burns 5021dbc1a0 Merge pull request #10046 from cjcullen/fwfix 
Allow passing through an explicit PROXY_SSH_USER.
 2015-06-18 13:13:19 -07:00
Tim St. Clair f5830edbbc s/gcloud preview docker/gcloud docker/ 2015-06-18 12:27:08 -07:00
Satnam Singh ce49c32d6a Add readiness probe to Elasticsearch and Kibana logging pods 2015-06-18 10:46:05 -07:00
CJ Cullen abf1e768dc Pass through an explicit PROXY_SSH_USER. 
Use user@user instead of user@hostname in case hostname is too long.
 2015-06-18 10:35:02 -07:00
wizard 509c3f5b94 hot fix for ubuntu k8s 2015-06-18 14:34:10 +08:00
Saad Ali b529557205 Merge pull request #9527 from Rob4001/master 
Added vagrant-libvirt plugin to vagrant provider check in install script
 2015-06-17 14:24:35 -07:00
Adam Sunderland 304d75caf9 Not about instance types 2015-06-17 11:32:22 -05:00
Jeff Lowdermilk 822fcacce4 Add missing source to ubuntu/util.sh 2015-06-17 09:21:38 -07:00
Marcin Wielgus b33b881bc2 Add missing --project in GCE kube-down and check-resources 2015-06-17 15:11:40 +02:00
Marcin Wielgus 3a562f1619 Check for existing GCE resources in kube-up 2015-06-17 15:04:39 +02:00
Saad Ali 8a511a77cd Merge pull request #9668 from mbruzek/fix-make 
Fixing an error I saw in testing, that make clean resolves.
 2015-06-16 18:41:14 -07:00
Vishnu Kannan b6e4480463 Updating heapster to v0.14.2 2015-06-16 17:15:24 -07:00
Brendan Burns d18dcabca5 Merge pull request #9786 from ZJU-SEL/UpdateDockerK8s 
Update docker k8s approach
 2015-06-16 15:53:25 -07:00
Vishnu Kannan c70014d399 Updating heapster service labels to make it compatible with `kubectl cluster-info` 2015-06-16 14:46:50 -07:00
Saad Ali 4d25121206 Merge pull request #9769 from brendandburns/secure 
Revert the revert of https://github.com/GoogleCloudPlatform/kubernetes/pull/9761
 2015-06-16 14:21:54 -07:00
Saad Ali 068000a8ba Merge pull request #9847 from mikedanese/apiserver-liveness-probe 
add livenessProbe to kube-apiserver.manifest
 2015-06-16 14:03:13 -07:00
Saad Ali 03af349173 Merge pull request #9758 from satnam6502/gcl-default 
Make Google Cloud Logging the default for GCE
 2015-06-16 13:47:56 -07:00
Saad Ali fc30ab308b Merge pull request #9886 from vishh/heapster_v0.14.1 
Updating heapster version to v0.14.1.
 2015-06-16 13:14:07 -07:00
Vishnu Kannan 31f7ea10c6 Updating heapster version to v0.14.1. 
Adding a standalone version of heapster which exposes stats via REST API.
 2015-06-16 11:56:23 -07:00
Saad Ali d31fd4035d Merge pull request #9227 from jlowdermilk/shell-cleanup 
Remove the last provider-specific handling in kubectl.sh, ginkgo-e2e.sh
 2015-06-16 11:55:47 -07:00
Saad Ali 41545d0a66 Merge pull request #9135 from jlowdermilk/fix-gce-kube-down 
Fix route regexp for gce-kube-down
 2015-06-16 11:54:45 -07:00
Jeff Lowdermilk e02483e3fe Fix route regexp for gce-kube-down 2015-06-16 11:25:43 -07:00
Jeff Lowdermilk 47901b7edd Remove the last provider-specific handling in kubectl.sh, ginkgo-e2e.sh 2015-06-16 10:58:04 -07:00