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

23326 Commits (7944fa01ec013ed97ba12e88c750f4146589e60a)

Author SHA1 Message Date
Eric Tune 7944fa01ec Disable flaky test. 2016-01-22 09:55:39 -08:00
Eric Tune a99e151b90 Merge pull request #19962 from erictune/service-account-try-not-flaky 
Promote ServiceAccount e2e out of [Flaky] status
 2016-01-22 09:41:30 -08:00
Zach Loafman ef77ce7147 Merge pull request #19985 from luxas/onedotfive 
Up to golang 1.5.3
 2016-01-22 07:21:06 -08:00
Zach Loafman a5f4f3b301 Merge pull request #16889 from vishh/disk-accounting 
Proposal for disk accounting
 2016-01-22 06:22:16 -08:00
Marcin Wielgus 631b965384 Merge pull request #19968 from lavalamp/e2e-kubectl-proxy 
e2e kubectl proxy test: Make future flake diagnosis possible
 2016-01-22 12:50:06 +01:00
Piotr Szczesniak 7fea0ada4b Merge pull request #19984 from piosz/heapster-config-fix 
Fixed syntax issue in Heapster config
 2016-01-22 10:34:58 +01:00
Piotr Szczesniak e6f3e2893a Fixed syntax issue in Heapster config 2016-01-22 10:29:38 +01:00
Lucas Käldström d26f4e1583 Up to golang 1.5.3 2016-01-22 08:21:52 +02:00
Zach Loafman 83a6b7fcaa Merge pull request #19957 from zmerlynn/container-vm-v20160121 
Bump to container-vm-v20151215
 2016-01-21 22:05:12 -08:00
Brendan Burns faf10632fe Merge pull request #19963 from freehan/monitor 
fix heapster rc file jinja syntax error
 2016-01-21 21:03:50 -08:00
Alex Mohr ca69c2e310 Merge pull request #19967 from justinsb/fix_gce_npe 
Fix for panic when instance not found
 2016-01-21 17:20:58 -08:00
Nikhil Jindal cd2e0c490e Merge pull request #19674 from nikhiljindal/latestAndRegistered 
Merge registered and latest and move to apimachinery
 2016-01-21 17:19:49 -08:00
Daniel Smith 23fd5e9a33 Make future flake diagnosis possible. 
It's currently unclear if the request failed because the proxy wasn't
quite up yet, or if it failed because traffic couldn't get from the
proxy to apiserver. Getting the proxy logs unconditionally should help
narrow this down.
 2016-01-21 16:41:26 -08:00
Justin Santa Barbara 2201c631b3 Fix for panic when instance not found 
This removes a panic I mistakenly introduced when an instance is not
found, and also restores the exact prior behaviour for
getInstanceByName, where it returns cloudprovider.InstanceNotFound when
the instance is not found.
 2016-01-21 19:15:09 -05:00
Eric Tune b048814beb Promote ServiceAccount e2e out of [Flaky] status 
Was marked as flaky prior to #11291, 6 months ago.
Code has changed many times.
No flakes in last 28 runs, and no Jenkins
history before that.
Follow up in #19024 if you see a flake.
 2016-01-21 16:13:56 -08:00
Alex Mohr 76f02d562a Merge pull request #19083 from resouer/allocatable 
Use Allocatable to replace Capacity
 2016-01-21 16:05:05 -08:00
Alex Mohr 69b28ce7e5 Merge pull request #19892 from krousey/rtwrap 
Add WrappedRoundTripper methods to round trippers
 2016-01-21 16:04:51 -08:00
Minhan Xia 3da8d80187 fix jinja syntax error 2016-01-21 16:03:49 -08:00
Alex Mohr 4ac2f7453d Merge pull request #19533 from kargakis/bloated-job-status-fix 
Fix job status conditions bloat
 2016-01-21 15:10:49 -08:00
Alex Mohr 9546909929 Merge pull request #19366 from ironcladlou/noop-zero-replicas 
Support rolling update to 0 desired replicas
 2016-01-21 15:08:20 -08:00
Alex Mohr 12845ba9a5 Merge pull request #18877 from markturansky/fix_18830 
Trigger syncClaim after PV provisioning to reduce wait
 2016-01-21 15:06:46 -08:00
Alex Mohr f788e1e11a Merge pull request #19446 from justinsb/aws_reboot_master_on_failure 
AWS: Create a cloudwatch alarm to reboot the master on failure
 2016-01-21 15:05:14 -08:00
Alex Mohr 12ecd67c01 Merge pull request #19703 from smarterclayton/add_protobuf 
Install protoc into kube-cross Docker image
 2016-01-21 14:59:41 -08:00
Alex Mohr ba6c939b3e Merge pull request #19887 from liggitt/export_transports 
Export transport constructors
 2016-01-21 14:54:40 -08:00
nikhiljindal 2ad642d370 Merge registered and latest and move to apimachinery 2016-01-21 14:42:21 -08:00
Zach Loafman 5965252421 Bump to container-vm-v20151215 
No new kubelet/docker. Bump kernel to address CVE-2016-0728.
 2016-01-21 14:32:20 -08:00
Alex Mohr a5dddfcb32 Merge pull request #19851 from thockin/fix-19723-test-strings 
Match regexes for error strings in e2e
 2016-01-21 14:31:47 -08:00
Alex Mohr e98fb3c424 Merge pull request #19810 from spiffxp/empty-docker-opts-cp 
Support building on remote docker-machine instances
 2016-01-21 14:30:57 -08:00
Alex Mohr 7d96694c3f Merge pull request #19725 from timstclair/summary 
Add blank /stats/summary kubelet endpoint
 2016-01-21 14:27:53 -08:00
Alex Mohr 359c684d57 Merge pull request #19698 from kargakis/expose-deployments 
kubectl: Support exposing deployments
 2016-01-21 14:26:14 -08:00
Alex Mohr 7742c6c78e Merge pull request #19673 from ihmccreery/feature-volumes 
Mark Volumes and PersistentVolumes as [Feature:Volumes] instead of [Skipped]
 2016-01-21 14:25:06 -08:00
Alex Mohr 21a5d57c75 Merge pull request #19481 from deads2k/fix-patch-admission 
make patch call update admission chain after applying the patch
 2016-01-21 14:23:19 -08:00
Alex Mohr 6b1830841e Merge pull request #19877 from mesosphere/jdef_fix_k8sm_735_scheduler_event_broadcaster_config 
MESOS: conformance fix: scheduler name should match api.DefaultSchedulerName
 2016-01-21 14:15:56 -08:00
Alex Mohr ad5dce89f0 Merge pull request #19790 from mqliang/podgc-event 
remove unused eventBroadcaster in gc controller
 2016-01-21 13:54:12 -08:00
Alex Mohr 1eabef0388 Merge pull request #19794 from mesosphere/jdef_fix_19672_camlistore_godeps 
updated appc/spec and camlistore/ godeps to fix broken godep restore
 2016-01-21 12:04:56 -08:00
Alex Mohr 8d021f3d88 Merge pull request #19897 from ixdy/test-golang-1.5.3 
Update tests from Go 1.5.2 to Go 1.5.3
 2016-01-21 12:00:00 -08:00
k8s-merge-robot bc55b1a58b Merge pull request #19857 from resouer/fakegit 
Auto commit by PR queue bot
 2016-01-21 11:29:14 -08:00
k8s-merge-robot 61096f4998 Merge pull request #19517 from spxtr/fix-test-go 
Auto commit by PR queue bot
 2016-01-21 11:25:58 -08:00
Alex Mohr fd9310fa6e Merge pull request #18452 from xiang90/refactor_nodiskconflicts 
scheduler: clean up NoDiskConflict code in predicates.go
 2016-01-21 10:58:41 -08:00
Alex Mohr 7cd28ec178 Merge pull request #19922 from gmarek/kube-up 
Slightly change warning printed when not all nodes are ready in validate-cluster.
 2016-01-21 10:56:46 -08:00
Alex Mohr f64a40f315 Merge pull request #19863 from justinsb/aws_fix_loadbalancer_tcp_check 
AWS: Eliminate assumptions about all load-balancer ports matching
 2016-01-21 10:52:20 -08:00
Alex Mohr b8f8a62775 Merge pull request #19862 from justinsb/aws_fix_tcploadbalancer_comment 
AWS: Fix comment to reflect new method name
 2016-01-21 10:51:37 -08:00
Alex Mohr 8e9bebb424 Merge pull request #19861 from justinsb/aws_remove_dead_code 
AWS: Remove dead code
 2016-01-21 10:51:06 -08:00
Alex Mohr 592ec2bb53 Merge pull request #19843 from ihmccreery/ga-features 
Add docs about [Feature:...] tests for experimental, beta, and GA features
 2016-01-21 10:50:47 -08:00
Alex Mohr e3bec5c1e8 Merge pull request #19833 from swagiaal/reclassify-security-context 
Relabel Security Context e2e
 2016-01-21 10:50:25 -08:00
Alex Mohr 1b6cc1e263 Merge pull request #19823 from erictune/test-spew 
Stop test spew on non-Linux.
 2016-01-21 10:45:25 -08:00
Alex Mohr d8be60ee57 Merge pull request #19777 from justinsb/echo_sleep_is_silly 
kube-up scripts: don't 'echo sleep'
 2016-01-21 10:44:38 -08:00
Alex Mohr 8044a5f1e1 Merge pull request #19676 from ihmccreery/feature-skip-e2e-test-go 
Skip [Feature:.+] instead of [Feature]
 2016-01-21 10:44:08 -08:00
Alex Mohr ae56a2a1d5 Merge pull request #19555 from spiffxp/verify-prereqs-noargs 
verify_prereqs doesn't special-case on 'clean' arg
 2016-01-21 10:43:41 -08:00
Alex Mohr 4c8e28b77c Merge pull request #19535 from brendandburns/salt 
Check that num_nodes is both defined and not None, not just defined
 2016-01-21 10:42:53 -08:00