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

14204 Commits (e5836cc93396d6add65942fa0b12a01940b42a14)

Author SHA1 Message Date
Wojciech Tyczynski e5836cc933 Merge pull request #10952 from mbforbes/JenkinsRemoveServer 
Jenkins: remove dead 'use server version' code
 2015-07-09 09:09:13 +02:00
Wojciech Tyczynski 534af353fb Merge pull request #10895 from JanetKuo/k8s-ui 
Update UI doc for the usage of Kubernetes UI
 2015-07-09 09:08:17 +02:00
Janet Kuo d0c618a25e Rephrase and remove redundant words 2015-07-08 23:13:52 -07:00
Zach Loafman 41f8907539 Merge pull request #10970 from zmerlynn/v0.21.1-merge-to-master 
V0.21.1 merge to master
 2015-07-08 19:30:16 -07:00
Zach Loafman 3910893d37 0.21.1 merge to master 2015-07-08 18:52:51 -07:00
Zach Loafman 539e7c8a89 Revert "Versioning docs and examples for 0.21.1" 
This reverts commit aa618a97f4.
 2015-07-08 18:52:51 -07:00
Zach Loafman 9d2691d48b Kubernetes version v0.21.1-dev 2015-07-08 18:52:51 -07:00
Zach Loafman 906122a279 Kubernetes version v0.21.1 2015-07-08 18:52:51 -07:00
Zach Loafman aa618a97f4 Versioning docs and examples for 0.21.1 2015-07-08 18:52:50 -07:00
Janet Kuo de97fb8ecf Update ui.md 2015-07-08 18:44:48 -07:00
Janet Kuo dbc8493cab Update ui.md 2015-07-08 18:35:30 -07:00
Zach Loafman 5c41af424f Merge pull request #10967 from thockin/automated-cherry-pick-of-#10488-on-upstream-release-0.21 
Automated cherry pick of #10488 on upstream release 0.21
 2015-07-08 18:33:28 -07:00
Justin Santa Barbara d306738bec Salt: re-remove comment block 
It had been removed in upstream, but had been kept by mistake here.
 2015-07-08 18:25:24 -07:00
Justin Santa Barbara cee489d499 Salt: have kube-addons service depend on init file 
For symmetry with systemd
 2015-07-08 18:25:24 -07:00
Justin Santa Barbara 191528b782 Salt: Add service block for kube-proxy for systemd 
We have the workaround for Salt's problems here, but we should still express
our intent.
 2015-07-08 18:25:24 -07:00
Justin Santa Barbara efce770fbb Salt: clean daemon_args on RedHat, not systemd 
I don't think it actually makes a difference based on how we're using it,
but this is now more of a precise change.
 2015-07-08 18:25:24 -07:00
Justin Santa Barbara aff1ffc319 Salt: Add more dependencies to systemd services 
This may help Salt reload services correctly, although we still
need the script until Salt's bug with reloading services on systemd
is resolved.

Salt bug: https://github.com/saltstack/salt/issues/16778
 2015-07-08 18:25:24 -07:00
Justin Santa Barbara a5fa0b8bb5 Set standard bash options in services helper script 2015-07-08 18:25:23 -07:00
Justin Santa Barbara d09c9fe355 Salt: support systemd (don't assume Redhat <=> systemd) 
Also work around problems with Salt & systemd services, in particular
that Salt doesn't issue a daemon-reload.
 2015-07-08 18:25:23 -07:00
Zach Loafman fb52d1e93e Merge pull request #10965 from zmerlynn/trappy 
Fix two issues in cherry_pick_pull.sh
 2015-07-08 18:17:16 -07:00
Zach Loafman 1d6db553b0 Fix two issues in cherry_pick_pull: 
* Ignore errexit in trap handler
* Check for branch (since two people have complained now..)
 2015-07-08 18:16:27 -07:00
Brendan Burns 7ccc0a4ec5 Merge pull request #10910 from zmerlynn/redo_build_official_release 
Add `build-official-release.sh` (take two)
 2015-07-08 17:26:02 -07:00
Victor Marmol 7bb9cdf660 Merge pull request #10830 from jimmidyson/gc-log-symlinks 
Fixes #8945: Cleanup log symlinks on remove & dead log symlinks
 2015-07-08 17:22:21 -07:00
Tim Hockin c5f6525545 Merge pull request #10961 from thockin/docs-bugfix-strip-release 
Fix quoting issue on sed
 2015-07-08 17:21:51 -07:00
Victor Marmol 9f3301d6f9 Merge pull request #10799 from caesarxuchao/output-clusterdns 
update kubectl get outputs in examples/cluster-dns
 2015-07-08 17:18:17 -07:00
Victor Marmol 0dc9b041c0 Merge pull request #10871 from caesarxuchao/kubernetes-ns-output 
update the output of kubectl get in examples/kubernetes-namespace
 2015-07-08 17:17:58 -07:00
Tim Hockin e099a7f0e0 Fix quoting issue on sed 2015-07-08 16:53:51 -07:00
Victor Marmol dd378f148b Merge pull request #10896 from thockin/docs-versioning-2 
Make READMEs even more obviously versioned.
 2015-07-08 16:24:40 -07:00
Victor Marmol f427b997ca Merge pull request #10889 from cjcullen/tokenMetrics 
Add prometheus metrics for altTokenSource.
 2015-07-08 16:13:38 -07:00
Victor Marmol cfbc64e3c5 Merge pull request #10864 from mbforbes/gcloudUpdateJenkins 
Fully update gcloud before Jenkins runs
 2015-07-08 16:13:27 -07:00
Victor Marmol f1e66c718d Merge pull request #10590 from roberthbailey/kubelet-on-nodes 
Install the kubectl binary on nodes in addition to the master.
 2015-07-08 16:13:12 -07:00
Victor Marmol 1d8c064fb9 Merge pull request #10948 from satnam6502/e2e 
End to end test for Kibana liveness
 2015-07-08 16:12:21 -07:00
Victor Marmol f5cbf5af0f Merge pull request #10923 from wojtek-t/promote_tests_2 
Promote ElasticSearch test to non-flaky suite
 2015-07-08 16:11:56 -07:00
Victor Marmol bad704f355 Merge pull request #10890 from caesarxuchao/node-selection-output 
update the kubectl get command in examples/node-selection
 2015-07-08 16:11:26 -07:00
Zach Loafman 51360aa350 Merge pull request #10947 from zmerlynn/automated-cherry-pick-of-#10562-on-upstream-release-0.21 
Automated cherry pick of #10562
 2015-07-08 16:07:48 -07:00
Zach Loafman 39c31bab40 Merge pull request #10939 from zmerlynn/automated-cherry-pick-of-#10884-on-upstream-release-0.21 
Automated cherry pick of #10884 on upstream release 0.21
 2015-07-08 16:06:23 -07:00
Zach Loafman f4a8727642 Merge pull request #10942 from brendandburns/automated-cherry-pick-of-#10877-on-release-0.21 
Automated cherry pick of #10877 on release 0.21
 2015-07-08 16:05:28 -07:00
Victor Marmol a599d80343 Merge pull request #10941 from caesarxuchao/getting-started-output 
update the kubectl output in gettint-started-guides
 2015-07-08 15:55:44 -07:00
Victor Marmol 105206e308 Merge pull request #10937 from JanetKuo/kubectl 
Make "age" of pod print example static
 2015-07-08 15:53:07 -07:00
Zach Loafman d63860411a Add `build-official-release.sh` 
This commit does 4 things:
* Adds a script which will: (a) clone from a git tag, make release,
and give you very detailed instructions as to what to do from that
point.
* Changes `push-official-release.sh` so we can't push "dirty"
releases anymore (which `build-official-release.sh` also double
checks at the end.)
* Fixes #9576 by ensuring a correct umask.
* Changes common.sh to gtar all the way through, to ensure that
bloody OS X tar never touches the release process, because I don't
want to have to understand two tar programs and how release
artifacts are created from both (c.f. #10615.)
 2015-07-08 15:20:22 -07:00
Victor Marmol da4ab51fd0 Merge pull request #10927 from markturansky/pv_example_fix 
Fixed image name in example
 2015-07-08 14:49:26 -07:00
Victor Marmol df3c437eed Merge pull request #10924 from kelcecil/node-doc 
Update CLI flags in node overview doc
 2015-07-08 14:46:15 -07:00
Victor Marmol 8b011691f1 Merge pull request #10912 from brendandburns/docs3 
Remove the unsafe_format_and_mount instructions
 2015-07-08 14:42:18 -07:00
Victor Marmol 50a3a0aa25 Merge pull request #10911 from brendandburns/docs2 
Add some additional clarity to label prefix requirements.
 2015-07-08 14:40:05 -07:00
Victor Marmol e4e83be24d Merge pull request #10887 from alex-mohr/release-notes2 
Update release notes tool and documentation
 2015-07-08 14:37:59 -07:00
Victor Marmol bb42bf79a6 Merge pull request #10231 from mwielgus/cassandra 
Fix IP field name and add namespace support in Cassandra example
 2015-07-08 14:37:14 -07:00
Victor Marmol 2f52cc7add Merge pull request #10907 from brendandburns/e2e2 
Add a pointer to a new java library.
 2015-07-08 14:30:40 -07:00
Victor Marmol fff24af86e Merge pull request #10859 from davidopp/clean 
Move scheduler overview from docs/design/ to docs/devel/
 2015-07-08 14:03:23 -07:00
Satnam Singh 31fe4da2cd End to end test for Kibana liveness 2015-07-08 14:01:56 -07:00
Victor Marmol 7dd0dc1786 Merge pull request #10752 from justinsb/aws_query_by_subnet_id 
AWS: Query by subnet-id, if we have it
 2015-07-08 13:57:33 -07:00