github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity
9,734 Commits 42 Branches 7,905 Tags 1.3 GiB
60f678be32
Commit Graph

9734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Bruzek
60f678be32 Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes into add-charms 2015-04-22 15:07:49 -05:00
Matt Bruzek
b69792535d Updating guestbook with the v1beta3 json files. 2015-04-22 15:05:46 -05:00
Brendan Burns
ee34d4942b Merge pull request #6576 from jeffmendoza/azure-loop 
Azure: Wait for salt completion on cluster initialization
 2015-04-22 12:51:40 -07:00
Brendan Burns
dacd0e0847 Merge pull request #6398 from BlueShells/master 
update the doc of fedora to let someone else out of trouble
 2015-04-22 12:51:06 -07:00
Matt Bruzek
b4766bb380 Removing unneeded status check before juju deployer 2015-04-22 14:45:50 -05:00
Robert Bailey
35a18e35c3 Merge pull request #7154 from cjcullen/readonly 
Change kube2sky to use token-system-dns secret, point at https endpoint ...
 2015-04-22 12:41:53 -07:00
Victor Marmol
a0cc7c26d7 Merge pull request #7185 from yifan-gu/interface 
kubelet/container: Move Prober/HandlerRunner interface to container/help...
 2015-04-22 12:16:10 -07:00
Yifan Gu
f59013410a kubelet/container: Move Prober/HandlerRunner interface to container/helpers.go 
This enables us to pass them to container runtime as parameters.
 2015-04-22 11:56:15 -07:00
Brian Grant
97302af015 Merge pull request #5012 from smarterclayton/podtemplates 
Pod templates as their own type
 2015-04-22 11:50:24 -07:00
Brendan Burns
2150e6d2af Merge pull request #7130 from preillyme/detailed-installation-instructions 
Update README to address issues
 2015-04-22 11:36:52 -07:00
Vish Kannan
a054201556 Merge pull request #7110 from swagiaal/improve-iscsi-test 
iscsi Test: Add explicit check for attach and detach calls.
 2015-04-22 11:21:42 -07:00
Vish Kannan
ee06097c07 Merge pull request #7003 from derekwaynecarr/enforce_unbounded 
Reject unbounded cpu and memory pods if quota is restricting it
 2015-04-22 11:19:52 -07:00
Clayton Coleman
d790cc14a9 Merge pull request #7163 from wojtek-t/conversion_benchmarks 
Create benchmarks for conversions.
 2015-04-22 14:10:46 -04:00
Robert Bailey
4ca8fbbec6 Merge pull request #7147 from fabioy/validate.fix 
Fix validate-cluster.sh to work on Mac.
 2015-04-22 11:06:46 -07:00
Fabio Yeon
46d7868fbd Merge pull request #7175 from zmerlynn/jenkins_skip_update 
Use KUBE_SKIP_UPDATE in Jenkins
 2015-04-22 11:03:46 -07:00
Fabio Yeon
c64874aab0 Merge pull request #7161 from chees/master 
Added an example for Meteor with raw documentation
 2015-04-22 10:58:13 -07:00
Zach Loafman
a590e5f240 Merge pull request #7178 from GoogleCloudPlatform/revert-7113-kube-proxy-token 
Revert "Added kube-proxy token."
 2015-04-22 10:55:38 -07:00
Zach Loafman
86468cd29d Revert "Added kube-proxy token." 2015-04-22 10:55:08 -07:00
Matt Bruzek
450f1f0215 Using readlink instead of realpath. 2015-04-22 12:53:30 -05:00
Zach Loafman
f12a59465e Merge pull request #7176 from zmerlynn/fix_updown 
Fix unbound variable after #7146
 2015-04-22 10:20:35 -07:00
Zach Loafman
0e3e502d52 Fix unbound variable after #7146 2015-04-22 10:19:53 -07:00
Zach Loafman
93207bfd1c Merge pull request #7174 from zmerlynn/fix_build 
Fix build after #7146
 2015-04-22 10:12:23 -07:00
Zach Loafman
42e1710ccf Fix build after #7146 2015-04-22 10:11:19 -07:00
Zach Loafman
e055ee0b71 Use KUBE_SKIP_UPDATE in Jenkins 
After #7146, we need to protect Jenkins from the internal gcloud bug (again).
 2015-04-22 10:08:09 -07:00
Zach Loafman
c9988db0ee Merge pull request #7146 from brendandburns/get-k8s 
Extend the get-cluster.sh script to use sudo if necessary.
 2015-04-22 09:58:07 -07:00
Clayton Coleman
09d86b5fdb Add completions 2015-04-22 12:54:28 -04:00
Clayton Coleman
7f1f0cd233 Add swagger pod template output 2015-04-22 12:54:28 -04:00
Clayton Coleman
e6e034af4f Rename PodTemplate.Spec to PodTemplate.Template 2015-04-22 12:54:27 -04:00
Clayton Coleman
10c2ace6bf Pod Templates 2015-04-22 12:54:25 -04:00
Brendan Burns
42121d1809 Extend the get-cluster.sh script to use sudo if necessary. 2015-04-22 09:52:44 -07:00
Matt Bruzek
dbca4bf5dd Using python to parse the json output from Juju. 2015-04-22 11:36:37 -05:00
Matt Bruzek
5deef09178 Exporting master and minion variables and calling detect methods in kube-up. 2015-04-22 11:35:49 -05:00
Wojciech Tyczynski
8b04e7f737 Merge pull request #7165 from fgrzadkowski/add_metrics_handler 
Add metrics handler in controller manager.
 2015-04-22 18:31:14 +02:00
Zach Loafman
b98f93bb4b Merge pull request #7112 from erictune/kubeconfig-secrets 
Extend PR#5470 for AWS and Vagrant
 2015-04-22 09:25:53 -07:00
Victor Marmol
1a41ec9c86 Merge pull request #7116 from yujuhong/container_status 
Print container statuses in `kubectl get pods`
 2015-04-22 09:18:14 -07:00
Zach Loafman
7e875a0f1c Merge pull request #7167 from pmorie/typo 
Fix typo in secrets integration test
 2015-04-22 09:17:11 -07:00
Zach Loafman
854c20c5e2 Merge pull request #7113 from erictune/kube-proxy-token 
Added kube-proxy token.
 2015-04-22 09:16:04 -07:00
Zach Loafman
f1d9a88be6 Merge pull request #7168 from pmorie/typo2 
Fix typo in networking e2e
 2015-04-22 08:48:03 -07:00
Matt Bruzek
35301bbcfd Merge branch 'add-charms' of github.com:mbruzek/kubernetes into add-charms 
Resolved conflicts in:
	cluster/juju/util.sh
 2015-04-22 10:36:42 -05:00
Robert Bailey
7854954fc2 Merge pull request #7158 from crossorigin/azure-0.15.0 
Set Weave To 0.9.0 And Update Etcd Configuration For Azure
 2015-04-22 08:33:02 -07:00
Matt Bruzek
af15d6d614 Removed the need for an extra python file. i 
- Formatted for consistency
- Used different variables for juju directory
 2015-04-22 10:31:26 -05:00
Matt Bruzek
3342bb42e0 Removed extra c in path to distro files. 2015-04-22 10:29:55 -05:00
Matt Bruzek
5f59e167fd Editing the local bundle to use github. 2015-04-22 10:29:07 -05:00
Matt Bruzek
4ce3b862c1 Merge pull request #2 from whitmo/add-charms 
Script and bundle tweaks
 2015-04-22 10:27:11 -05:00
Victor Marmol
914a6febfb Merge pull request #7010 from yifan-gu/compute 
kubelet: Refactor computePodContainerChanges().
 2015-04-22 08:05:18 -07:00
Paul Morie
87ddd7c2e7 Fix typo in networking e2e 2015-04-22 10:57:26 -04:00
Paul Morie
d381db1778 Fix typo in secrets integration test 2015-04-22 10:54:54 -04:00
Filip Grzadkowski
9357341995 Add metrics handler in controller manager. 2015-04-22 16:46:03 +02:00
Whit Morriss
0ab77ae8be line formatting 2015-04-22 09:40:47 -05:00
Whit Morriss
a57a64781a scripting tweaks 
- use absolute path for kube_root (fixes JUJU_REPOSITORY directory creation issue) - shortcircuit status polling (for rerunning kubeup)
 - more granular polling iterations
 2015-04-22 09:40:47 -05:00