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

23311 Commits (ca69c2e310db993bd59f613454de1e77cf89672b)

Author SHA1 Message Date
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
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
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
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
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
Alex Mohr a77f7205ea Merge pull request #19506 from a-robinson/goversion 
Resolve old TODO that was waiting on us to move off of go 1.3
 2016-01-21 10:42:06 -08:00
Alex Mohr 233d292ae5 Merge pull request #19456 from justinsb/salt_fix_tar_filemode 
Salt: mode for tar file should be 644, not 755
 2016-01-21 10:40:38 -08:00
Alex Mohr 753b1f3ae6 Merge pull request #19419 from spxtr/gcp-resource 
Export variables needed by e2e-runner.sh.
 2016-01-21 10:38:41 -08:00
Alex Mohr 8755f3e8a3 Merge pull request #19407 from justinsb/aws_fix_salt_helium_detection 
AWS: don't rely on salt for kube-node-unpacker on AWS
 2016-01-21 10:38:08 -08:00
Alex Mohr 20ec685a50 Merge pull request #19271 from mbonaci/patch-1 
Fix small dns readme error
 2016-01-21 10:36:34 -08:00
Alex Mohr 766ee6cf0b Merge pull request #19819 from ysh7/master 
Problem with centos cluster creation script
 2016-01-21 10:35:09 -08:00
Alex Mohr 94b2490eba Merge pull request #19580 from WeixuZhuang/node 
resolve the bug when cluster CIDR is not /8
 2016-01-21 10:34:19 -08:00
Alex Mohr 819cdc85d3 Merge pull request #19390 from danielschonfeld/optimize-kubelet-heartbeat-aws 
optimize kubelet heartbeats instance data to be cached for AWS
 2016-01-21 10:33:00 -08:00
Alex Mohr 3a70c14349 Merge pull request #19609 from quinton-hoole/2016-01-13-improve-compute-resources-docs 
Remove accidental cruft from compute-resources.md document.
 2016-01-21 10:32:08 -08:00
Alex Mohr c52122cab5 Merge pull request #19675 from apcera/kubelet-report-runtime-version 
Update container runtime to properly report the engine and version
 2016-01-21 10:31:19 -08:00
Alex Mohr 8f0ab67819 Merge pull request #19241 from mesosphere/karlkfi-docker-cluster 
Extract keygen image
 2016-01-21 10:29:39 -08:00
Alex Mohr 1ab41d5238 Merge pull request #16509 from miminar/namespace_field_conv 
Add missing field label conversions for Namespace
 2016-01-21 10:27:02 -08:00
Alex Mohr d2d349bc84 Merge pull request #19334 from resouer/network 
Networking should be used to hold network related pkgs
 2016-01-21 10:26:13 -08:00
Alex Mohr 8c9aa2af33 Merge pull request #19733 from janetkuo/flaky-deployment-recreate 
Fix e2e flake: Sync deployment status when with RecreateDeploymentStrategy
 2016-01-21 10:23:21 -08:00