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

2245 Commits (458eb5284abd6933c620ba8ea383032f225e0885)

Author SHA1 Message Date
k8s-merge-robot 3f5e417999 Merge pull request #19502 from swagiaal/internalize-ownership 
Auto commit by PR queue bot
 2016-01-26 23:06:39 -08:00
Eric Paris 8e1ca68760 Merge pull request #20020 from apcera/cleanup-docker-engine-check 
kubelet: Update engine version parsing to handle semantic versioning
 2016-01-26 11:44:02 -05:00
k8s-merge-robot 8c821700f3 Merge pull request #19389 from justinsb/internal_cidr 
Auto commit by PR queue bot
 2016-01-26 03:58:48 -08:00
k8s-merge-robot 52cb4c1d9d Merge pull request #18445 from resouer/fix-emptydir 
Auto commit by PR queue bot
 2016-01-26 02:45:54 -08:00
Tim Hockin c924533e45 Add logs to try to diagnose #17181 2016-01-25 15:01:03 -08:00
harry 0fa5b6c4f7 Add e2e test for wrapper volumes 
Use git server in e2e and refactor wrapper builder

Update e2e test to use a fake git server
 2016-01-24 16:57:44 +08:00
Ken Robertson 66c99d5e9c kubelet: Update FakeDockerClient used in integration tests 
This updates the mock for the docker client used in integration tests to
include the engine version in its VersionInfo response.
 2016-01-22 17:14:01 -08:00
Ken Robertson fff8a7c371 kubelet: Update engine version parsing to handle semantic versioning 
This updates the dockertools.dockerVersion to use a semantic versioning
library to more gracefully support engine versions which include
additional version fields.

Previously, go-dockerclient's APIVersion struct was use which only
handles plain numeric x.y.z version strings. With #19675, the library
was now used on the Docker engine string, however it is possible for the
engine string to include include additional information for beta, rc, or
distro specific builds.

This PR also enables the TestDockerRuntimeVersion test which was
previously just a FIXME and updates it to pass, and be used to test the
version string that cause #20005.

This negates the need for fsouza/go-dockerclient#451, since even with
that change, if a user was running Docker 1.10.0-rc1, this would cause
the kubelet to report it as simply 1.10.0.
 2016-01-22 13:18:52 -08:00
Clayton Coleman 4a6935b31f Remaining codec change refactors 2016-01-22 13:27:27 -05:00
Clayton Coleman 33085c0cf2 Update tests to handle codec changes 2016-01-22 13:27:26 -05:00
nikhiljindal 2ad642d370 Merge registered and latest and move to apimachinery 2016-01-21 14:42:21 -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
Justin Santa Barbara 58191c446c Allow non-masquerade-cidr to be passed to the kubelet 
Removing the hard-coding of 10.0.0.0/8

Issue #11204
 2016-01-21 15:18:31 -05: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 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 79e0c9f5e5 Merge pull request #19842 from yujuhong/status_update 
Don't handle graceful deletion of mirror pods in status manager
 2016-01-21 09:24:46 -08:00
Alex Mohr 9a264c4b41 Merge pull request #19838 from yujuhong/empty_add 
Fix empty ADD update on kubelet restarts
 2016-01-21 09:22:53 -08:00
k8s-merge-robot e2c79915fd Merge pull request #18820 from mqliang/image-gc-bug 
Auto commit by PR queue bot
 2016-01-21 01:22:29 -08:00
k8s-merge-robot d0f59e2126 Merge pull request #18172 from Random-Liu/generate-sync-event 
Auto commit by PR queue bot
 2016-01-20 22:48:35 -08:00
Ken Robertson a7b07c01df Update container runtime to properly report the engine and version 
This address a TODO when collecting the node version information so it
will properly report the configured runtime and its version. Previously,
this was hardcoded to "docker://" and the docker version, and would show
"docker://1.9.1" even when the kubelet was configured to use rkt.

With this change, it will use the runtime's Type() and Version() data.

This also changes the container.Runtime interface to add an APIVersion()
method. This can be used when the runtime has separate versions for the
engine and the API, such as with Docker. The Docker minimum version
validation has been updated to use APIVersion(), and
DockerManager.Version() now returns the engine version.
 2016-01-20 16:42:25 -08:00
Yu-Ju Hong dc5b35a570 Set default status to pending for pods from non-apiserver sources 2016-01-20 09:36:01 -08:00
Yu-Ju Hong f1535a0d4c Don't handle graceful deletion of mirror pods in status manager 2016-01-19 16:47:57 -08:00
Paul Morie c548054560 Add ability to consume secrets in env vars 2016-01-18 12:20:51 -05:00
Piotr Szczesniak 9659057986 Revert "Enable kubecontainer.Cache in kubelet" 2016-01-18 13:35:41 +01:00
Lantao Liu 4c37dbe6e6 Merge pull request #19690 from Random-Liu/fix-bug-in-status-test 
Fix bug in status/manager_test.go
 2016-01-18 01:15:16 -08:00
k8s-merge-robot fcf8263b1b Merge pull request #19572 from pwittrock/exportfsmetrics 
Auto commit by PR queue bot
 2016-01-17 07:46:02 -08:00
k8s-merge-robot 0051dcc83e Merge pull request #19560 from Random-Liu/format-reconcile-log 
Auto commit by PR queue bot
 2016-01-17 04:51:05 -08:00
Random-Liu 0e612afa98 Start using PodSyncResult in dockertools 2016-01-17 00:42:45 -08:00
Random-Liu f2176643e7 Add unit test for PodSyncResult 2016-01-17 00:42:45 -08:00
Random-Liu 2d31d8ed4c Add PodSyncResult 2016-01-17 00:42:44 -08:00
k8s-merge-robot ac0d01f8ca Merge pull request #19436 from yujuhong/status_cache_p2 
Auto commit by PR queue bot
 2016-01-16 09:24:19 -08:00
k8s-merge-robot ffed4e1a3a Merge pull request #19428 from yifan-gu/rkt_isolator 
Auto commit by PR queue bot
 2016-01-16 08:48:38 -08:00
Mike Danese 936c8cd597 Merge pull request #19685 from resouer/testing 
Replace fake handler using testing pkg
 2016-01-15 17:47:53 -08:00
Tim St. Clair 5a0dc30b51 Add blank /stats/summary kubelet endpoint 
Add a `/stats/summary` endpoint to the kubelet which will return an
empty Summary{} struct (json formatted), as a summary API
placeholder. Once the next cAdvisor release is vendored, the summary
API will be filled in.
 2016-01-15 14:55:54 -08:00
Random-Liu 8fb056d258 Add getTestPod() to avoid sharing object among test cases 2016-01-15 11:22:15 -08:00
k8s-merge-robot 21aa683fb5 Merge pull request #18974 from pmorie/config-env 
Auto commit by PR queue bot
 2016-01-15 06:42:56 -08:00
combk8s 5b383dad62 fix image gc bug 2016-01-15 16:43:22 +08:00
harry 98222b4d8b Replace to tag 
Use a testing pkg to replace testing util codes
 2016-01-15 15:07:21 +08:00
Harry Zhang 936a11e775 Use networking to hold network related pkgs 
Change names of unclear methods

Use net as pkg name for short
 2016-01-15 13:46:16 +08:00
Mike Danese 33c72db59c Merge pull request #19528 from resouer/strings-util 
Create strings pkg to fix util issue
 2016-01-14 21:19:17 -08:00
harry 7405c7899b Add strings pkg to hold strings utils 
Replace funtions with strings pkg

Fix all references and rename the pkg
 2016-01-15 12:37:50 +08:00
Phillip Wittrock bb216e53da Define stats api fields for exporting filesystem metrics #17331 2016-01-14 15:52:35 -08:00
Yu-Ju Hong c9faecba9d Merge pull request #19668 from Random-Liu/fix-bug-in-reconcile 
Fix bug in needsReconcile
 2016-01-14 14:29:29 -08:00
Mike Danese 9745d1cbf0 Merge pull request #19626 from mikedanese/kubelet-labels 
kubelet: use ConfigurationMap instead of json
 2016-01-14 14:08:53 -08:00
Prashanth B 926b94fefc Merge pull request #19493 from bprashanth/kubelet_fix 
Errors in network setup should prevent pod creation
 2016-01-14 13:49:19 -08:00
Yu-Ju Hong 15950daa7f Restore the old behavior of setting pod status to pending 2016-01-14 13:46:26 -08:00
Random-Liu fed61731f1 Fix bug in needsReconcile 2016-01-14 13:44:02 -08:00
Mike Danese 41df8749a8 Merge pull request #19470 from gmarek/kubemark-performance 
Shorten the sleep amount in the fake docker client
 2016-01-14 11:55:24 -08:00
Mike Danese 14378485f3 Merge pull request #19629 from yifan-gu/rkt_debug_logging 
rkt: Add useful debugging message.
 2016-01-14 11:49:18 -08:00
Mike Danese 35a3785cf6 kubelet: use ConfigurationMap instead of json 2016-01-14 09:32:42 -08:00