github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity
15,458 Commits 42 Branches 7,905 Tags 1.3 GiB
c752bc6ffb
Commit Graph

15458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brendan Burns
c752bc6ffb Merge pull request #11738 from daizuozhuo/master 
JSONPath template language
 2015-07-31 09:48:47 -07:00
Jerzy Szczepkowski
acc276831f Merge pull request #12077 from Huawei-PaaS/salt-doc-link 
Modify dead link in the document.
 2015-07-31 15:21:15 +02:00
Jerzy Szczepkowski
ff058a1afe Merge pull request #11376 from jiangyaoguo/new-builder-cleaner-in-volume 
Refactor awsElasticBlockStore to seperate builder and cleaner
 2015-07-31 12:57:43 +02:00
Jerzy Szczepkowski
64a68afadb Merge pull request #10341 from feihujiang/removeDuplicateSource 
Remove the duplicate source (filename) in error message
 2015-07-31 12:57:22 +02:00
Jerzy Szczepkowski
95072f2ee2 Merge pull request #10701 from feihujiang/outputTheSameErrorUsingDescribeForNonexist 
Output the same error when using kubectl describe for a nonexisting resource
 2015-07-31 12:56:58 +02:00
Jian Huang
45c37b9bd0 Update README.md 
There is a bad link in the doc. change ../../docs/salt.md to ../../docs/admin/salt.md
 2015-07-31 18:44:06 +08:00
Jerzy Szczepkowski
b0d31fb794 Merge pull request #12052 from BenTheElder/boot2docker_memory 
Update build/README.md to note memory requirements for boot2docker.
 2015-07-31 09:17:02 +02:00
Jerzy Szczepkowski
5ec7680554 Merge pull request #12023 from resouer/patch-4 
Remove duplicated warning of docker version
 2015-07-31 09:16:18 +02:00
Piotr Szczesniak
41de62b465 Merge pull request #12022 from piosz/cadvisor 
Update cadvisor dependency
 2015-07-31 05:56:36 +02:00
feihujiang
4553e410d3 Remove the duplicate source (filename) in error message 2015-07-31 10:20:45 +08:00
feihujiang
fc31543460 Output the same error when using kubectl describe for a nonexisting resource 2015-07-31 09:56:02 +08:00
Mike Danese
a101aa175d Merge pull request #12047 from thockin/devdocs 
Add a note on when to use commits
 2015-07-30 17:50:57 -07:00
Mike Danese
853ea5bab2 Merge pull request #11880 from mwielgus/rethinkdb-flaky 
Add retry logic to http service request in test/e2e/examples.go
 2015-07-30 17:37:06 -07:00
Mike Danese
bfaa527139 Merge pull request #12045 from a-robinson/logs 
Fix fluentd configs to collect etcd logs on the master
 2015-07-30 17:36:46 -07:00
Mike Danese
51a7a38f67 Merge pull request #12020 from wojtek-t/move_to_storage 
Move storage-related code to pkg/storage
 2015-07-30 16:23:03 -07:00
Mike Danese
622bf70f57 Merge pull request #11963 from a-robinson/manifest 
Make the kubelet on a GCE master check instance metadata for manifests
 2015-07-30 16:21:53 -07:00
BenTheElder
c86306f889 Update building docs to note memory requirements for boot2docker. 2015-07-30 19:19:33 -04:00
Alex Robinson
69ab7026af Update fluentd-es to collect etcd logs and remove merge conflict cruft. 2015-07-30 22:21:01 +00:00
Alex Robinson
9e18c29e9f Make fluentd-gcp collect etcd's logs on the master. 2015-07-30 22:20:57 +00:00
Tim Hockin
c58e3fbbb6 Add a note on when to use commits 2015-07-30 15:11:38 -07:00
Mike Danese
ed9975b031 Merge pull request #11230 from mesosphere/resource-accounting 
Implement resource accounting for pods with the Mesos scheduler
 2015-07-30 14:36:41 -07:00
Mike Danese
cdb7d1ec61 Merge pull request #11960 from brendandburns/docker 
Update docker instructions to 1.0.1
 2015-07-30 14:12:41 -07:00
Alex Robinson
94ae0a9a0d Make the kubelet on a GCE master check instance metadata for manifests. 
Primary motivation: enable GKE and other cluster-as-a-service folks to
easily run additional logic on the master without having to modify salt
or SSH to the master after it's been created.
 2015-07-30 21:04:34 +00:00
Mike Danese
a3cb57f48d Merge pull request #12033 from smarterclayton/conversions_2 
Revert conversion reversion with fixed tests
 2015-07-30 13:53:32 -07:00
Mike Danese
9582c7e54e Merge pull request #12024 from a-robinson/metadata 
Support passing a header to the manifest URL in the kubelet.
 2015-07-30 13:46:22 -07:00
Mike Danese
5747df378d Merge pull request #11946 from mamikonyana/service-node-port-range 
Allow settings --service-node-port-range option using a config variable
 2015-07-30 13:23:45 -07:00
Brendan Burns
f89c9e3878 Merge pull request #11998 from vishh/update_heapster 
Auto commit by PR queue bot
 2015-07-30 13:10:02 -07:00
Mike Danese
553b6e674f Merge pull request #10540 from deads2k/prevent-backsteps-in-kubeconfig 
Prevent backsteps in kubeconfig
 2015-07-30 13:05:11 -07:00
Arsen Mamikonyan
792849251a Allow settings --service-node-port-range option using a config variable 2015-07-30 12:39:32 -07:00
Dr. Stefan Schimanski
f3f617d9db Update documentation about resource accounting 2015-07-30 21:18:15 +02:00
Dr. Stefan Schimanski
a2fa41b73f Implement resource accounting for pods with the Mesos scheduler 
This patch

- set limits (0.25 cpu, 64 MB) on containers which are not limited in pod spec
  (these are also passed to the kubelet such that it uses them for the docker
  run limits)
- sums up the container resource limits for cpu and memory inside a pod,
- compares the sums to the offered resources
- puts the sums into the Mesos TaskInfo such that Mesos does the accounting
  for the pod.
- parses the static pod spec and adds up the resources
- sets the executor resources to 0.25 cpu, 64 MB plus the static pod resources
- sets the cgroups in the kubelet for system containers, resource containers
  and docker to the one of the executor that Mesos assigned
- adds scheduler parameters --default-container-cpu-limit and
  --default-container-mem-limit.

The containers themselves are resource limited the Docker resource limit which
the kubelet applies when launching them.

Fixes mesosphere/kubernetes-mesos#68 and mesosphere/kubernetes-mesos#304
 2015-07-30 21:18:04 +02:00
Clayton Coleman
532e1ca20c Update generator tests to passing 2015-07-30 15:15:28 -04:00
Clayton Coleman
0f9fdcafea Revert "Revert "Improve conversion to support multiple packages"" 
This reverts commit 94a387d5d1.
 2015-07-30 15:15:14 -04:00
deads2k
c5ef83b29b relativize paths in kubeconfig files 2015-07-30 14:57:38 -04:00
deads2k
55f574c267 switch kubeconfig types to internal map[string]*struct 2015-07-30 14:57:38 -04:00
Mike Danese
33278e7910 Merge pull request #11844 from brendandburns/queue 
Add an initial (simple) implementation of a submit queue.
 2015-07-30 11:36:28 -07:00
Mike Danese
dd3195084d Merge pull request #11992 from pmorie/nodecontroller-now 
Accurately report ts used to make decisions in node-controller.go
 2015-07-30 11:18:06 -07:00
Mike Danese
14c483898b Merge pull request #12027 from GoogleCloudPlatform/revert-9971-make_conversion_more_flexible 
Revert "Improve conversion to support multiple packages"
 2015-07-30 11:14:55 -07:00
Mike Danese
94a387d5d1 Revert "Improve conversion to support multiple packages" 2015-07-30 10:51:40 -07:00
Alex Robinson
a9f0c4683f Limit the logging from kubelet attempting to read its manifest URL. 
Without this, it logs an error every 20 seconds if nothing is at the
provided URL.
 2015-07-30 17:47:33 +00:00
Vishnu Kannan
c08ad6b7c1 Avoid mounting ssl volumes for heapster container. 2015-07-30 10:45:26 -07:00
Mike Danese
452bdcae2d Merge pull request #11895 from derekwaynecarr/vagrant_confornamce_tickbox 
Vagrant passes conformance tests at HEAD
 2015-07-30 10:35:34 -07:00
Alex Robinson
cf011cad55 Support passing a header to the manifest URL in the kubelet. 
Needed to support using GCE's v1 metadata API, which requires passing
the header "Metadata-Flavor: Google".
 2015-07-30 17:11:27 +00:00
Mike Danese
1a613c43fe Merge pull request #9971 from smarterclayton/make_conversion_more_flexible 
Improve conversion to support multiple packages
 2015-07-30 10:05:10 -07:00
Brendan Burns
1d9a0623f2 Merge pull request #11047 from gurvindersingh/master 
modified spark example to use kubectl exec to interact with cluster a…
 2015-07-30 10:01:10 -07:00
Mike Danese
0ae48c449e Merge pull request #11927 from wojtek-t/remove_shell_services 
Remove shell services test
 2015-07-30 09:56:38 -07:00
Mike Danese
1ae4a94257 Merge pull request #11949 from justinsb/golang_switch_type_autocast 
Cleanup #11029 to use go autocast-after-type-switch
 2015-07-30 09:54:33 -07:00
Mike Danese
71536711a4 Merge pull request #11811 from gmarek/framework 
Move addon_update e2e test to framework
 2015-07-30 08:23:16 -07:00
Mike Danese
01de52e91a Merge pull request #11931 from stensonb/master 
minor doc typo
 2015-07-30 08:21:04 -07:00
Mike Danese
aca1eb6184 Merge pull request #11983 from caesarxuchao/11854 
downgrade errors returned by watchHandler in reflector.go to warnnings
 2015-07-30 08:20:05 -07:00