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

7093 Commits (d98485242efa0e72759c1987dff06bec4b77b741)

Author SHA1 Message Date
Alex Mohr d98485242e Merge pull request #4780 from jdef/bug_4757 
add unit test for #4757
 2015-03-09 11:13:53 -07:00
Alex Mohr ee276b26cb Merge pull request #5124 from MikeJeffrey/ex3 
Deleting old sample JSON; moving those in use; updating references
 2015-03-09 10:58:44 -07:00
Alex Mohr 71da06b9a6 Merge pull request #5083 from quinton-hoole/2015-03-04-add-github-flow-docs 
Add documentation about the Kubernetes Github Flow.
 2015-03-09 10:57:55 -07:00
Jeff Lowdermilk b650e481a7 Merge pull request #5160 from brendandburns/service 
Fix coverage testing to work on OS X, where xargs is different.
 2015-03-09 10:18:46 -07:00
Alex Robinson f4e5e01172 Merge pull request #5173 from you-n-g/simple_typo 
simple typo
 2015-03-09 10:18:25 -07:00
Eric Tune 85c7ced8d3 Merge pull request #5089 from thockin/docs2 
Add a better networking doc
 2015-03-09 10:17:04 -07:00
Rohit Jnagal 8798b0ae14 Merge pull request #5158 from thockin/use_fuzz_no_custom 
Use new gofuzz features
 2015-03-09 10:13:46 -07:00
Rohit Jnagal 77546692a7 Merge pull request #5187 from vmarmol/wait-docker 
Kubelet: wait up to 5m for Docker to come up.
 2015-03-09 10:09:09 -07:00
Victor Marmol ca84aae454 Kubelet: wait up to 5m for Docker to come up. 
The Kubelet assumes Docker is running during its execution and on
machine boot it is a race between Docker coming up and Kubelet calling
Docker. This PR waits for Docker to be up before the Kubelet begins
doing useful work. On timeout, Kubelet exits and expects to be
restarted.
 2015-03-09 09:50:34 -07:00
Victor Marmol 02590e9a86 Merge pull request #5174 from smarterclayton/lowercase_hostname 
Kubelet tests broken on Macs with uppercase names
 2015-03-09 08:46:01 -07:00
James DeFelice bf02d17244 rebased to master 2015-03-09 14:08:11 +00:00
James DeFelice 4943fe937b implemented nil err checks, cc @yujuhong @davidopp 2015-03-09 14:06:27 +00:00
James DeFelice e5350d61a8 added comment suggested by @davidopp 2015-03-09 14:06:27 +00:00
James DeFelice 436790ccd1 add unit test for #4757 
fixed compilation error
 2015-03-09 14:06:27 +00:00
roberthbailey ee1e40d4bc Merge pull request #5179 from you-n-g/simple_typo2 
simple typo
 2015-03-09 15:05:38 +01:00
Young d3725153bc simple typo 2015-03-09 13:38:41 +00:00
Clayton Coleman 0f87337667 Kubelet tests broken on Macs with uppercase names 
Hostname behavior across operating systems is inconsistent (Macs can
have uppercase host names, so can some other systems).  In general,
always strings.ToLower(os.Hostname()).
 2015-03-08 23:44:32 -04:00
Young 8bb4a4b439 simple typo 2015-03-08 15:38:21 +00:00
Brendan Burns 2b7ae7fcd4 Fix coverage testing to work on OS X, where xargs is different. 2015-03-07 11:01:41 +01:00
Tim Hockin fd1e49ce2f Use new gofuzz features 2015-03-07 00:04:14 -08:00
Vish Kannan 53ec66caf4 Merge pull request #5152 from vmarmol/cadvisor-dep 
Rename cAdvisor info API to cadvisorApi
 2015-03-06 18:09:28 -08:00
Victor Marmol 1866adddd3 Merge pull request #5157 from yifan-gu/clean_prober 
Adjust prober's logging verbose.
 2015-03-06 18:04:12 -08:00
Yifan Gu da5d7c7814 Adjust prober's logging. 2015-03-06 17:30:29 -08:00
MikeJeffrey 4da6d413be Deleting old sample JSON; moving those in use; updating references 2015-03-06 17:24:45 -08:00
Victor Marmol 798513844c Merge pull request #5148 from yifan-gu/clean_prober 
Refactor pkg/kubelet/kubelet.go: probeContainer().
 2015-03-06 17:04:57 -08:00
Yifan Gu 276fb1731c Refactor pkg/kubelet/kubelet.go: probeContainer(). 
Put the retry loop in probe.go into a function.
 2015-03-06 16:57:20 -08:00
Tim Hockin 8c843d638c Add a better networking doc 2015-03-06 16:48:56 -08:00
Yifan Gu 131e8a0e35 Refactor pkg/kubelet/kubelet.go: probeContainer(). 
Update the probe_test.go.
 2015-03-06 16:38:09 -08:00
Yifan Gu 09af0cd3b5 Refactor pkg/kubelet/kubelet.go: probeContainer(). 
Split the function into probeContainerLiveness() and probeContainerReadiness().
 2015-03-06 16:37:58 -08:00
Victor Marmol 43b469bd9f Rename cAdvisor info API to cadvisorApi 2015-03-06 16:06:38 -08:00
Dawn Chen b71fc76ec4 Merge pull request #5146 from yujuhong/k8s 
Fix typos in docs/man/README.md
 2015-03-06 16:04:26 -08:00
Dawn Chen 9439c0f3bd Merge pull request #5103 from yujuhong/naming 
kubelet: revamp the pod/container naming scheme
 2015-03-06 15:58:58 -08:00
Vish Kannan 9e5c79a587 Merge pull request #5151 from vmarmol/cadvisor-dep 
Update cAdvisor godep
 2015-03-06 15:56:48 -08:00
Victor Marmol a35f4374c5 Update cAdvisor ContainerInfo references to v1 API. 
The cAdvisor data structures were versioned recently. We use the v1
versions so this commit makes that explicit.
 2015-03-06 15:42:06 -08:00
Victor Marmol 7e97d22e91 Update cAdvisor dependency and remove perigee. 
Perigee dependency is unused.
 2015-03-06 15:41:20 -08:00
Daniel Smith 05ea93f985 Merge pull request #5147 from a-robinson/func 
Re-add the defer statements around the monitor() calls in the apiserver.
 2015-03-06 15:31:45 -08:00
Alex Robinson 60f0e9d673 Fix the broken calls to the monitor() by having it take arguments as pointers. 
This is needed for the changes to various labels from later in the function
to be picked up.
 2015-03-06 23:16:44 +00:00
Brian Grant a858c7423e Merge pull request #5070 from vishh/issue_3628 
Adding description to some of the v1beta3 objects.
 2015-03-06 14:49:11 -08:00
Brian Grant f557837d43 Merge pull request #5066 from vmarmol/man 
Adding links to relevant docs from API types.
 2015-03-06 14:46:43 -08:00
Filipe Brandenburger 9ed827fb73 Merge pull request #5145 from dchen1107/containervm 
Upgrade to latest containervm image: v20150305
 2015-03-06 14:31:42 -08:00
Eric Tune c12303eaa3 Merge pull request #4749 from derekwaynecarr/make_quota_more_efficient 
Make admission control plug-ins work from indexes
 2015-03-06 14:11:12 -08:00
Tim Hockin 0682e15814 Merge pull request #5096 from markturansky/pv_proposal 
WIP: Persistent storage proposal
 2015-03-06 14:02:43 -08:00
Yu-Ju Hong 748bebe46f Fix typos in docs/man/README.md 2015-03-06 14:01:26 -08:00
Dawn Chen 38178299bb Upgrade to latest containervm image: v20150305 2015-03-06 13:54:33 -08:00
Vishnu Kannan bd83093b0b Adding description to some of the v1beta3 objects. 2015-03-06 21:50:50 +00:00
Eric Tune b259640a5f Merge pull request #5072 from justinsb/fix_aws_test 
Fix the logic around the AWS instance test
 2015-03-06 13:49:41 -08:00
Yu-Ju Hong fe70be9261 kubelet: revamp the pod/container naming scheme 
There are two main goals for this change.

 1. Fix the naming scheme in kubelet so that it accepts DNS subdomain
    name/namespaces correctly (#4920). The design is discussed in #3453.

 2. Prepare for syncing the static pods back to the apiserver(#4090). This
    includes

  - Eliminate the source component in the internal full pod name (#4922). Pods
    no longer need sources as they will all be sync'd via apiserver.

  - Changing the naming scheme for the static (file-, http-, and etcd-based)
    pods such that they are distinguishable when syncing back to the apiserver.

The changes includes:
  *	name = <pod.Name>-<hostname>
  * namespace = <cluster_namespace> (i.e. "default" for now).
  * container_name = k8s_<contianer_name>.<hash_of_container>_<pod_name>_<namespace>_<uid>_<random>

Note that this is not backward-compatible, meaning the kubelet won't recognize
existing running containers using the old naming scheme.
 2015-03-06 13:14:45 -08:00
Yu-Ju Hong 32fd331e73 Revert "Split up kubelet "source seen" logic" 
We want to sync pods from file/http/etcd sources to the apiserver, hence
differentiating sources is no longer desired.

This reverts commit 110ab6f1bd.
 2015-03-06 12:57:48 -08:00
Daniel Smith a8dd10dab7 Merge pull request #4907 from ddysher/kubelet-client-interface 
kubelet should take a client interface
 2015-03-06 12:32:57 -08:00
Deyuan Deng 50de1a80c2 kubelet should take a client interface 2015-03-06 15:01:55 -05:00