github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity
8,070 Commits 42 Branches 7,905 Tags 1.3 GiB
9615849874
Commit Graph

8070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saad Ali
9615849874 Merge pull request #5958 from relaxdiego/fix_comprise 
Fix confusing use of "comprise"
 2015-03-25 15:10:10 -07:00
Mark Maglana
fd29104ff5 Fix confusing use of "comprise" 
The word "comprise" means "be composed of" or "contain" so
"applications comprised of multiple containers" would mean
"applications composed of of multiple containers" or "applications
contained of multiple containers" which is confusing.

I understand that this is nitpicking and that "comprise" has a new
meaning which is the opposite of its original definition just like
how "literally" now means "figuratively" to some people. However, I
believe that clarity is of utmost importance in technical
documentation which is why I'm proposing this change.
 2015-03-25 14:55:34 -07:00
Saad Ali
f3ebe30605 Merge pull request #5940 from justinsb/fix_bash_style 
Fix bash style issues in AWS script
 2015-03-25 14:40:42 -07:00
Saad Ali
b815fbf2b8 Merge pull request #5941 from justinsb/aws_scope_security_group_to_vpc 
Security group should be scoped to our vpc
 2015-03-25 14:40:25 -07:00
Jeff Grafton
901a5dbe2b Merge pull request #5687 from nikhiljindal/client_test 
Updating test-go.sh and test-integration.sh to be able to run the tests for multiple API versions
 2015-03-25 14:07:47 -07:00
Yu-Ju Hong
6145b3b9c4 Merge pull request #5738 from smarterclayton/cleanup_clients 
Clients should not check conditions, UpdateStatus() is inconsistent
 2015-03-25 13:59:47 -07:00
David Oppenheimer
76889fa3ae Merge pull request #5818 from simon3z/boot-id 
nodecontroller: record node reboot event
 2015-03-25 13:50:21 -07:00
Dawn Chen
b002b9e2e1 Merge pull request #5934 from vmarmol/update 
Update cAdvisor dependency.
 2015-03-25 13:45:41 -07:00
Clayton Coleman
c35593a717 Merge pull request #5938 from nikhiljindal/swagger 
Updating to the latest go-restful code and regenerating the swagger spec
 2015-03-25 16:25:58 -04:00
Clayton Coleman
b1ab14315b Clients should not check conditions, UpdateStatus() is inconsistent 
Corrects some of the cargo culting that has crept into the API.
 2015-03-25 16:25:04 -04:00
Robert Bailey
d96d8a9faf Merge pull request #5803 from ihmccreery/guestbook-example-point-to-getting-started 
Guestbook example README points to Getting Started, not SETUP.md
 2015-03-25 13:02:45 -07:00
Justin Santa Barbara
06704bb94f Security group should be scoped to our vpc 
Note that security group names only need to be unique with a VPC as well,
which is handy here.
 2015-03-25 12:53:12 -07:00
Yu-Ju Hong
5d628770c1 Merge pull request #5926 from vmarmol/fast-test 
Reduce testing time of status_manager_test.
 2015-03-25 12:52:27 -07:00
nikhiljindal
5e4ab8e045 Updating test-go.sh to be able to run tests twice - for v1beta1 and 3 2015-03-25 12:51:22 -07:00
Justin Santa Barbara
ac12665f48 Quote AWS_SSH_KEY 2015-03-25 12:41:02 -07:00
Justin Santa Barbara
80ba56a371 Fix variable dollar-char errors 2015-03-25 12:36:52 -07:00
Justin Santa Barbara
505488269c Use double-square brackets in if tests 2015-03-25 12:36:20 -07:00
Rohit Jnagal
35b2c5ce9d Merge pull request #5881 from satnam6502/serve_hostnames 
Change defaults, retry on errors and report stats for serve_hostnames
 2015-03-25 12:13:47 -07:00
Federico Simoncelli
2db64d3f90 nodecontroller: record node reboot event 
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-03-25 15:06:53 -04:00
Federico Simoncelli
5b3056cdb7 nodecontroller: add event recorder support 
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-03-25 15:06:53 -04:00
Federico Simoncelli
afbf401464 nodeinfo: add boot id system information 
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-03-25 15:06:53 -04:00
Derek Carr
bf14cbf682 Merge pull request #5930 from markturansky/fix_quota_registry_names 
Changed arg names from 'pod' to 'resourceQuota'
 2015-03-25 15:03:41 -04:00
Victor Marmol
65070d6d81 Reduce testing time of status_manager_test. 
Adds tests for syncBatch().
 2015-03-25 11:45:06 -07:00
Zach Loafman
529c886f0d Merge pull request #5925 from jlowdermilk/fix-watch-events 
Fix e2e-watch-events.sh
 2015-03-25 11:44:57 -07:00
Dawn Chen
e54cbf6e07 Merge pull request #5886 from vmarmol/net-host-1 
Implement Kubelet support for HostNetwork by pod source
 2015-03-25 11:41:01 -07:00
nikhiljindal
9b718ff557 Updating swagger-spec with the latest go-restful code 2015-03-25 11:34:33 -07:00
Clayton Coleman
590acda4e2 Merge pull request #5932 from rjnagal/cleanup 
Add a pointer to kubernetes-dev to API changes doc.
 2015-03-25 14:32:08 -04:00
nikhiljindal
ea77e9f31c Updating go-restful to the latest version 2015-03-25 11:30:29 -07:00
Saad Ali
0d852d80bc Merge pull request #5935 from BenTheElder/BenTheElder-osx-docs 
Update gce.md OSX instructions per issue #5852
 2015-03-25 11:25:36 -07:00
nikhiljindal
620844bcb3 Updating swagger spec 2015-03-25 11:24:08 -07:00
Victor Marmol
cf7e2756b5 Add HostNetworkSources capability to limit use of HostNetwork. 2015-03-25 11:23:06 -07:00
Victor Marmol
d9cd7a78f7 Allow starting a container with --net=host. 2015-03-25 11:22:03 -07:00
Clayton Coleman
27c668b54a Merge pull request #5441 from kazegusuri/port_minion_registry 
Port minion registry to generic etcd
 2015-03-25 14:18:17 -04:00
Victor Marmol
35b08c65ec Update cAdvisor dependency. 
Updated dependency on oauth2.
 2015-03-25 11:14:27 -07:00
Benjamin Elder
8446cc9c50 Update gce.md OSX instructions per issue #5852 
Update /docs/getting-started-guides/gce.md prerequisites to include relevant urls for osx.
See https://github.com/GoogleCloudPlatform/kubernetes/issues/5852 for the related issue.
 2015-03-25 14:10:04 -04:00
Rohit Jnagal
3dfa26305e Add a pointer to kubernetes-dev to API changes doc. 2015-03-25 18:00:52 +00:00
Victor Marmol
5eb373692b Merge pull request #5928 from yujuhong/pod_status 
Kubelet: pass the acutal pod for status update
 2015-03-25 10:51:32 -07:00
Victor Marmol
f7135b3dd4 Merge pull request #5827 from spothanis/master 
added cloud provider flag to kubelet
 2015-03-25 10:50:18 -07:00
Masahiro Sano
7c5481c11a return 200 instead 409 Conflict 2015-03-26 02:44:43 +09:00
Masahiro Sano
c49af0b7cb port minion registry to generic etcd 2015-03-26 02:44:35 +09:00
Alex Robinson
c22d4c6b3f Merge pull request #5916 from justinsb/aws_cleanup_loadbalancers 
Remove load balancers as part of kube-down.sh
 2015-03-25 10:32:14 -07:00
markturansky
89a17a410c changed arg names from 'pod' to 'resourceQuota' 2015-03-25 13:23:31 -04:00
Robert Bailey
659fc558f6 Merge pull request #5900 from brendandburns/api3 
Add support for grabbing the externalIP in the GCE cloud provider.
 2015-03-25 10:16:51 -07:00
Satnam Singh
32909a3368 Change defaults, retry on errors and report stats 2015-03-25 10:12:49 -07:00
Yu-Ju Hong
b4b0bc75c4 Kubelet: pass the acutal pod for status update 
Pod status update should include the ObjectMeta of the pod. This change is
required for #5738 to merge.
 2015-03-25 09:58:46 -07:00
Filip Grzadkowski
2ad3af246a Merge pull request #5924 from fgrzadkowski/fix_integration 
Wait for etcd shutdown in integration tests
 2015-03-25 17:25:10 +01:00
Saad Ali
1f50bd226b Merge pull request #5854 from fgrzadkowski/delete_pod_cache 
Delete pod_cache and rely on updating pod status by kublet.
 2015-03-25 09:17:09 -07:00
Jeff Lowdermilk
7fcc69d00d Fix e2e-watch-events.sh 2015-03-25 09:16:06 -07:00
Eric Paris
50452994cb Merge pull request #5847 from aveshagarwal/kubernetes-fedora-guides-minions 
Describes addition and deletion of minions (or nodes) at run time, and some other fixes.
 2015-03-25 12:04:59 -04:00
Filip Grzadkowski
aa9e25f293 Wait for etcd shutdown in integration tests 2015-03-25 17:01:04 +01:00