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

12986 Commits (9f60f3ce4455013530c628ae5121a5c618c6f764)

Author SHA1 Message Date
Saad Ali 9f60f3ce44 Merge pull request #9831 from jayunit100/local-up-from-docker 
Allow docker/ or other source directory for local-up
 2015-06-16 16:17:06 -07:00
Saad Ali c463467f7b Merge pull request #9730 from mikedanese/gitignore 
add some more temporary files to gitignore
 2015-06-16 16:02:19 -07:00
Saad Ali 68edcaa08b Merge pull request #9900 from pmorie/nfs-e2e 
Fix typo in volumes e2e
 2015-06-16 15:58:49 -07:00
Saad Ali 6ada940e7f Merge pull request #9706 from hurf/shorten_id 
Shorten container ID in events
 2015-06-16 15:58:30 -07:00
Saad Ali f82accda25 Merge pull request #9582 from mnagy/fix_quoting 
Quote integers correctly
 2015-06-16 15:55:58 -07:00
Brendan Burns d18dcabca5 Merge pull request #9786 from ZJU-SEL/UpdateDockerK8s 
Update docker k8s approach
 2015-06-16 15:53:25 -07:00
Saad Ali 7266f4930f Merge pull request #9901 from vishh/svc_name 
Updating heapster service labels to make it compatible with `kubectl cluster-info`
 2015-06-16 15:51:34 -07:00
Saad Ali 418ab026c3 Merge pull request #9839 from lavalamp/logSpam 
remove broken ginkgo Done concept from tests
 2015-06-16 15:50:11 -07:00
Saad Ali a1e3e536c3 Merge pull request #9820 from thockin/dead-code 
Remove dead code
 2015-06-16 15:49:53 -07:00
Saad Ali a00b55c023 Merge pull request #9770 from brendandburns/notes 
Add some more logic to clean up the release-notes generation.
 2015-06-16 15:49:29 -07:00
Saad Ali f7cb6e9844 Merge pull request #9890 from ncdc/fix-exec-infinite-loop 
Eliminate possible infinite loop in exec
 2015-06-16 15:03:25 -07:00
Saad Ali 0aae358d2d Merge pull request #9835 from caesarxuchao/remove-testapi-nsQuery 
Update pkg/api/testapi because namespace is always in the path now
 2015-06-16 14:54:36 -07:00
Saad Ali 9fd02fcf7f Merge pull request #9811 from erictune/matrix 
Add conformance column to matrix.
 2015-06-16 14:52:26 -07:00
Saad Ali 5e597c5f0d Merge pull request #9826 from brendandburns/redirect 
Remove the redirect verb.
 2015-06-16 14:51:24 -07:00
Vishnu Kannan c70014d399 Updating heapster service labels to make it compatible with `kubectl cluster-info` 2015-06-16 14:46:50 -07:00
Saad Ali 369a1e7761 Merge pull request #9894 from markturansky/image_change 
Changed busybox image to gcr.io image for PV Recyclers
 2015-06-16 14:42:19 -07:00
Paul Morie 0ec8332418 Fix typo in volumes e2e 2015-06-16 17:24:02 -04:00
Saad Ali 4d25121206 Merge pull request #9769 from brendandburns/secure 
Revert the revert of https://github.com/GoogleCloudPlatform/kubernetes/pull/9761
 2015-06-16 14:21:54 -07:00
Chao Xu a309d3e652 Update pkg/api/testapi because namespace is always in the path since we remove v1beta1/2 2015-06-16 14:12:03 -07:00
Saad Ali 068000a8ba Merge pull request #9847 from mikedanese/apiserver-liveness-probe 
add livenessProbe to kube-apiserver.manifest
 2015-06-16 14:03:13 -07:00
Saad Ali d5b40de7b4 Merge pull request #9867 from marekbiskup/doc-overview 
clarification of name uniqueness
 2015-06-16 14:02:06 -07:00
Saad Ali 591132f4ae Merge pull request #9871 from marekbiskup/doc-service 
formatting
 2015-06-16 14:00:47 -07:00
Saad Ali 03af349173 Merge pull request #9758 from satnam6502/gcl-default 
Make Google Cloud Logging the default for GCE
 2015-06-16 13:47:56 -07:00
Saad Ali d6b50d5602 Merge pull request #9823 from caesarxuchao/remove-PodContainerInfo 
remove PodContainerInfo from api/types.go
 2015-06-16 13:38:53 -07:00
markturansky cfc08c4fdf Changed busybox img to official gcr.io image 2015-06-16 16:15:19 -04:00
Saad Ali fc30ab308b Merge pull request #9886 from vishh/heapster_v0.14.1 
Updating heapster version to v0.14.1.
 2015-06-16 13:14:07 -07:00
Andy Goldstein 7748a02e37 Eliminate possible infinite loop in exec 
If a user starts an exec session with a shell and leaves it idle long
enough, they will eventually hit the Kubelet's HTTP server's read/write
timeout of 5 minutes. At this time, the StartExec call to Docker exits,
but if the user requested a TTY, the exec'd process does not exit.
After StartExec finishes, we try to determine the exit code of the
exec'd process, but in this case, we'll never get it. This change exits
the loop after 5 tries if the process is still running.
 2015-06-16 15:44:09 -04:00
Saad Ali d763252b01 Merge pull request #9869 from marekbiskup/doc-links 
doc links
 2015-06-16 12:06:11 -07:00
Saad Ali a99e2a2d0c Merge pull request #9872 from marekbiskup/doc-rc 
small clarifications in RC doc
 2015-06-16 12:05:39 -07:00
Vishnu Kannan 31f7ea10c6 Updating heapster version to v0.14.1. 
Adding a standalone version of heapster which exposes stats via REST API.
 2015-06-16 11:56:23 -07:00
Saad Ali d31fd4035d Merge pull request #9227 from jlowdermilk/shell-cleanup 
Remove the last provider-specific handling in kubectl.sh, ginkgo-e2e.sh
 2015-06-16 11:55:47 -07:00
Saad Ali 41545d0a66 Merge pull request #9135 from jlowdermilk/fix-gce-kube-down 
Fix route regexp for gce-kube-down
 2015-06-16 11:54:45 -07:00
Jeff Lowdermilk e02483e3fe Fix route regexp for gce-kube-down 2015-06-16 11:25:43 -07:00
Brendan Burns 1dd18673ec Merge pull request #9762 from jlowdermilk/negotiate-api-version 
kubectl negotiates api version to use based on client,server supported versions
 2015-06-16 11:18:08 -07:00
Mike Danese bfaf68fc85 add some more temporary files to gitignore 2015-06-16 11:14:13 -07:00
Brendan Burns 96c244eacf Merge pull request #9848 from cjcullen/fwfix 
Fix mislooping in ssh.go. Add retries to AddSSHKeys.
 2015-06-16 11:10:30 -07:00
Jeff Lowdermilk 47901b7edd Remove the last provider-specific handling in kubectl.sh, ginkgo-e2e.sh 2015-06-16 10:58:04 -07:00
Saad Ali 27704beae5 Merge pull request #9856 from justinsb/spelling_mistakes 
Minor typos in cluster/addons/README.md
 2015-06-16 10:55:41 -07:00
Saad Ali 5596e6f789 Merge pull request #9493 from marekbiskup/testAddonUpdate 
e2e test for addon upgrade
 2015-06-16 10:50:15 -07:00
Eric Tune 73e873dc12 Change docs/getting-started-guides/README.md 
Reformats.
Remove duplicate rows.
Adds empty conformance test column.
(more on this soon.)
 2015-06-16 10:41:07 -07:00
CJ Cullen 48f672af92 Change SSHTunnelList to struct to make Open() semantics better. 2015-06-16 10:36:38 -07:00
Jeff Lowdermilk f31191224b kubectl negotiates apiversion to use based on client,server supported 2015-06-16 10:12:39 -07:00
Saad Ali dae03043d4 Merge pull request #9732 from ixdy/e2e-coredump 
e2e: in core dump, add delta to waitgroup outside of goroutine
 2015-06-16 09:16:29 -07:00
Marek Biskup 5a2b96c455 clarifications 2015-06-16 17:38:42 +02:00
Marek Biskup b71bf667b5 formatting 2015-06-16 17:35:20 +02:00
Marek Biskup 28792c2d50 doc links 2015-06-16 17:31:45 +02:00
Marek Biskup aa0c816d9f clarification of name uniqueness 2015-06-16 17:19:37 +02:00
Filip Grzadkowski 6674913f92 Merge pull request #9858 from fgrzadkowski/skip_density 
Skip density test in a regular e2e run
 2015-06-16 15:35:54 +02:00
Filip Grzadkowski 74736d903f Skip density test in a regular e2e run 2015-06-16 15:29:18 +02:00
Justin Santa Barbara 0d2f587cea Minor typos in cluster/addons/README.md 2015-06-16 09:18:23 -04:00