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

498 Commits (6485584fca5082a45f0eb24b1645111ea75b46c2)

Author SHA1 Message Date
k8s-merge-robot 2084fba199 Merge pull request #18842 from vishh/kubelet_docker 
Auto commit by PR queue bot
 2016-02-04 17:08:34 -08:00
Phillip Wittrock ba5be34574 Kubelet Metrics Summary Api Implementation 2016-02-04 14:05:28 -08:00
Saad Ali 7d70edc91f Merge pull request #20553 from jonboulle/yifan-gu-rkt_dns 
rkt: Add DNS support
 2016-02-04 10:55:38 -08:00
Dan Williams fabb65c13f Add a network plugin that duplicates "configureCBR0" functionality 2016-02-03 10:08:08 -06:00
Yifan Gu e9139bb0e5 kubelet: Rename RunContainerOptionsGenerator to RuntimeHelper. 
Also add GetClusterDNS() to the interface to let rkt get the
DNS servers, DNS names.
 2016-02-03 14:54:08 +01:00
Jeff Lowdermilk caa9433234 Merge pull request #20433 from lavalamp/fix-bad-rv 
Add timeout, fix potential startup hang
 2016-02-02 17:27:23 -08:00
k8s-merge-robot c0fd002fbb Merge pull request #20019 from thockin/dont-cni-hostnet-pods 
Auto commit by PR queue bot
 2016-02-02 01:43:24 -08:00
Daniel Smith 4a7d70aef1 extend fake clock 2016-02-01 15:36:15 -08:00
harry 1032067ff9 Replace runtime reference by pkg 2016-02-01 21:06:44 +08:00
k8s-merge-robot 9fef5f2938 Merge pull request #19785 from Random-Liu/remove-get-podstatus-and-apipodstatus 
Auto commit by PR queue bot
 2016-01-30 11:35:26 -08:00
Alex Robinson 5c53b3a13b Merge pull request #20335 from aveshagarwal/master-integration-tests-issue 
Fix docker version errors in integration tests.
 2016-01-30 10:40:06 -08:00
k8s-merge-robot 29c640d5ba Merge pull request #19579 from Random-Liu/add-new-reason-cache 
Auto commit by PR queue bot
 2016-01-30 02:06:49 -08:00
Random-Liu f116a5eb8f Remove temporary function GetPodStatusAndAPIPodStatus() 2016-01-30 00:39:26 -08:00
Random-Liu e93febfd61 Start returning PodSyncResult in SyncPod 2016-01-30 00:25:50 -08:00
k8s-merge-robot 2d061aa199 Merge pull request #19784 from Random-Liu/cleanup-kubelet-syncpod 
Auto commit by PR queue bot
 2016-01-30 00:25:49 -08:00
k8s-merge-robot deef16d2b3 Merge pull request #19354 from jimmidyson/system-container-fix 
Auto commit by PR queue bot
 2016-01-29 19:13:43 -08:00
Avesh Agarwal de804332f4 Fix docker version errors in integration tests. 2016-01-29 13:48:07 -05:00
Fabio Yeon eb2c2d1af4 Merge pull request #20111 from fabioy/fix-tmp-tests 
Add temp directory creation method for tests.
 2016-01-29 09:51:12 -08:00
Jimmi Dyson 1c289943f5 Ensure kubelet pid is not moved to system container 2016-01-29 09:30:20 +00:00
Fabio Yeon 547a2e2387 Merge pull request #20131 from thockin/logs-for-19574 
Augment logs in runContainer path
 2016-01-28 13:49:59 -08:00
Andy Goldstein 86ae623a09 Help debug port forward flakes 2016-01-28 15:28:40 -05:00
Fabio Yeon 7205a160ac Remove all instances of "/tmp" from unit tests and replace with a common 
tmp directory creator. Exception is documented.
 2016-01-27 16:11:22 -08:00
Tim Hockin df4c1ccd14 Don't apply net plugins to net=host pods 2016-01-27 15:43:33 -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
Tim Hockin 45e5912c3d Augment logs in runContainer path 
Generating errors that are useful is hard.
 2016-01-25 16:31:32 -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 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
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
Random-Liu eb56d46b74 Minor clean up in kubelet syncPod() 2016-01-20 17:31:59 -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
Random-Liu 0e612afa98 Start using PodSyncResult in dockertools 2016-01-17 00:42:45 -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
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
k8s-merge-robot c255181509 Merge pull request #18248 from resouer/images-dev 
Auto commit by PR queue bot
 2016-01-11 23:53:43 -08:00
Saad Ali 651206fd90 Merge pull request #19393 from yujuhong/fix_dockerclient 
Fix fake docker client to corretly report status of containers
 2016-01-11 13:56:41 -08:00
gmarek 573c3ca320 Shorten the sleep amount in the fake docker client 2016-01-11 12:15:11 +01:00
k8s-merge-robot 609cdfd267 Merge pull request #19331 from resouer/hash-util 
Auto commit by PR queue bot
 2016-01-09 13:08:01 -08:00
harry zhang 27ca7dc71e Expose image list in node status 
Change image manager to use repotag
 2016-01-08 17:01:31 +08:00
Yu-Ju Hong b969599daf Fix fake docker client to corretly report status of containers 2016-01-07 18:20:41 -08:00
Clayton Coleman 791d160b42 Split the Kubelet flag options and struct 
Reduces the size of the app/server.go file and ensures that the flags
and their defaults are clearly separated.
 2016-01-06 21:23:06 -05:00
harry 2a52976983 Use hashutil to hold hash tools 2016-01-06 22:28:58 +08:00
k8s-merge-robot 38f926dbb9 Merge pull request #19206 from Random-Liu/remove-wired-docker-label 
Auto commit by PR queue bot
 2016-01-05 19:32:01 -08:00
Random-Liu 884dc5c9e5 Put TerminationGracePeriod, DeletionGracePeriod and PreStopHandler to docker labels 2016-01-05 15:45:29 -08:00
Random-Liu 2ea11690b8 Remove running pod from SyncPod() of container runtime 2016-01-04 10:18:46 -08:00
Random-Liu b2a72ca384 Change my TODO to be the same with others 2015-12-31 00:41:05 -08:00