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

72 Commits (48c6b7ea96526952e33ff9bee913660b274b5cef)

Author SHA1 Message Date
eulerzgy 9d14d1115f change minions to nodes 2015-09-19 00:01:49 +08:00
Matt Bruzek 7a387a87a1 Changes necessary to enable ssl for the Juju charms 
Squashed commit of the following:

commit dedaccffdc1d797b5f23e0004280c2fcc0ecffa9
Merge: 24c3585 f03a267
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Tue Sep 15 17:07:42 2015 -0500

    Merge branch 'master' of github.com:kubernetes/kubernetes into enable-ssl

commit 24c358566cc0963fb86dc057db15739f031ba6f6
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Tue Sep 15 16:44:58 2015 -0500

    Fixing problems with verify-boilerplate.

commit a64443352c64498255ac98fc0da1a7d8d5934485
Merge: f152794 ee3f662
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Tue Sep 15 15:43:08 2015 -0500

    Merge branch 'enable-ssl' of github.com:mbruzek/kubernetes into enable-ssl

    Conflicts:
    	cluster/juju/util.sh

commit f152794502c017ae7d3cff0351d8bf44b7311883
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 14:12:21 2015 -0500

    Fixes for problems found in testing.

commit 94effa4827d5f30c60621e9133c4526c187e40b4
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 12:34:37 2015 -0500

    Making updates for changes in master branch.

commit a81795b44e57d54b8b4ae486ca6ea8164ac8fc6b
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:39:36 2015 -0500

    pep8 fix

commit 53a862caea02c4b35f8cd19b1549fda29e040f12
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:37:31 2015 -0500

    Adding diagnostic log messages and reloading nginx.

commit 96411a924fb05e2e58534cce94d9a1e51d7db9af
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:19:31 2015 -0500

    Making the check user logic cleaner.

commit a0243b34cdda2f865e559bd4812c5a78ab6f6f05
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:18:04 2015 -0500

    Open port 6443 for ssl enablement.

commit e8423614763aa6d650089c735c3dc1893bf73993
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:16:54 2015 -0500

    Generating certificates and adding config options.

commit 6570a818e252f2cb156a577094ba987dec834fe1
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:14:56 2015 -0500

    Removing the http configuration adding https config.

commit e624bd79f8840b71b141a111bca7c6091b677575
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:13:04 2015 -0500

    Changed the distribution nginx config slightly.

commit c497911170268ee75bed53afeb5fa32ff44c82af
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:57:17 2015 -0500

    Adding the crt and key to the apiserver flags.

commit 6c1e76c5de31eb4d0f800065ce4bc96a82801846
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:56:15 2015 -0500

    Adding the cert and key configuration parameters.

commit 55da910d473efa0be0af5efccf2336612525986e
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:49:46 2015 -0500

    Adding a requirements file to install path.py with pip -r

commit 27a39686af89e134268be50ce5e4fc36cffdf2b3
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Fri Aug 21 16:34:56 2015 -0500

    Making the install hook idempotent.

commit ee3f66287ba045592f932c3a41aeb8e0167a9235
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 14:12:21 2015 -0500

    Fixes for problems found in testing.

commit 3dfdbb0e21d79da66617f7a29e6dd8d977528057
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 12:34:37 2015 -0500

    Making updates for changes in master branch.

commit df9c297fe27c63713fc0d7dbd461b2d47133614c
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:39:36 2015 -0500

    pep8 fix

commit 645b25d9cc84555ca7af5c75e3f0b1300aaa9f48
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:37:31 2015 -0500

    Adding diagnostic log messages and reloading nginx.

commit 57654320bd73dc4dd52d6d56021d40a97c6ed893
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:37:02 2015 -0500

    Removing xtrace.

commit a0e8cd98353e7cd411786bc8836fe99a77cde3ba
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:19:31 2015 -0500

    Making the check user logic cleaner.

commit 6c6eb7ff02d6dbf66d3175b715e957b00a861525
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:18:04 2015 -0500

    Open port 6443 for ssl enablement.

commit 29f18cc95ff96de1a48f72af2cff2e37420a43c7
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:16:54 2015 -0500

    Generating certificates and adding config options.

commit c9bdaa499552980153ff263a1ab9b4fa73a0536a
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:14:56 2015 -0500

    Removing the http configuration adding https config.

commit ec33e66a159a4b44207353b16741c7fad2e4ee0d
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 11:13:04 2015 -0500

    Changed the distribution nginx config slightly.

commit 96dc16879c0dd230569ceb928f9f7bf92ff8ab3f
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:57:17 2015 -0500

    Adding the crt and key to the apiserver flags.

commit 308799502c0a22f214408395f5efa4821d075374
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:56:15 2015 -0500

    Adding the cert and key configuration parameters.

commit 7f407a4356de8703ff2f237432084f35910d8abd
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Wed Sep 9 10:49:46 2015 -0500

    Adding a requirements file to install path.py with pip -r

commit f800ae1152076758d4db203fdbecf6d945c0e892
Author: Matt Bruzek <matthew.bruzek@canonical.com>
Date:   Fri Aug 21 16:34:56 2015 -0500

    Making the install hook idempotent.

Resolving verification problems.
 2015-09-17 15:23:02 -05:00
Ed Costello 1916d3bb74 Copy edits for typos (resubmitted) 2015-08-25 10:47:58 -04:00
Jeff Lowdermilk 438216844f Stop reusing basic auth on cluster create 2015-08-22 11:45:46 -07:00
Matt Bruzek 56bd3c756a Updated all the references of GoogleCloudPlatform/kubernetes repo name to the new kubernetes/kubernetes 2015-08-13 15:29:48 -05:00
Marek Grabowski 5f9cefc1d8 Merge pull request #12441 from vlajos/typofixes-vlajos-20150807 
typofix - https://github.com/vlajos/misspell_fixer
 2015-08-10 16:33:52 +02:00
Marek Grabowski 4f7d9863f5 Merge pull request #12362 from mbruzek/post-v1-fixes 
Post v1 fixes
 2015-08-10 14:54:05 +02:00
Ed Costello 35a5eda585 Copy edits for typos 2015-08-09 14:18:06 -04:00
Veres Lajos 9f77e49109 typofix - https://github.com/vlajos/misspell_fixer 2015-08-08 22:31:48 +01:00
Eric Paris 86ca88be61 convert cluster/ from --flag_name= --flag-name= 2015-08-07 11:00:13 -04:00
Matt Bruzek b0ee17c41b Found another mention of minion changed to node. 2015-08-06 16:40:55 -05:00
Matt Bruzek d024013970 Fixing an idempotency problem found in testing. 2015-08-06 15:56:23 -05:00
Matt Bruzek e3579ccb17 Changing "Minion" to "Node" on node registration 2015-08-06 15:29:56 -05:00
Mike Danese fe6b15ba2f rewrite all links to issues to k8s links 2015-08-05 21:11:11 -07:00
nikhiljindal 2e9e46dd08 Updating scripts to use v1 instead of v1beta3 2015-07-01 00:23:16 -07:00
Saad Ali 8a511a77cd Merge pull request #9668 from mbruzek/fix-make 
Fixing an error I saw in testing, that make clean resolves.
 2015-06-16 18:41:14 -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
Matt Bruzek 2576b56113 Fixing an error I saw in testing, that make clean resolves. 2015-06-11 10:14:06 -05:00
Matt Bruzek e32c9e4f10 Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes into build-local 
Conflicts:
	cluster/juju/bundles/local.yaml
 2015-05-29 17:36:48 -05:00
Matt Bruzek 774f7e3738 Changed a comment for flake8 reasons. 2015-05-29 15:26:07 -05:00
Tim Hockin 3005471100 Add new apiserver flags for clusterIP (nee portal) 
Leave old flags but marked as deprecated
 2015-05-28 16:10:44 -07:00
Matt Bruzek f261702ef6 Adding kube-down logic to utils.sh to clean up. 2015-05-28 16:58:55 -05:00
Matt Bruzek a464d624e6 Chaning the bundle to use the new config value. 2015-05-28 13:40:25 -05:00
Matt Bruzek d344eb6cf0 Making the alias a variable to be replaced by the code. 2015-05-28 13:39:11 -05:00
Matt Bruzek b112606f54 Setting the alias variable on the template data. 2015-05-28 13:36:53 -05:00
Matt Bruzek 08733d9362 Adding the 'local' option to install binaries from local filesystem. 2015-05-28 11:16:14 -05:00
Matt Bruzek e013541573 Changing the util.sh to build kubernetes binaries locally. 2015-05-28 11:08:09 -05:00
Whit Morriss dd81cfd4b8 update to latest tag 2015-05-28 10:13:19 -05:00
Charles Butler 7f38d62b65 Repeat fix for docker charm (but point @ store copy) 2015-05-21 14:46:29 -04:00
Charles Butler f40820391a Repoint flannel-docker service to ~kubernetes namespace 
This branch of the charm-store charm is tracking features targeted at
kubernetes based deployments, while the devel focus will continually be
in a state of experimentation and learning.

As all things awesome - deploy in lockstep from a source that has
extensive testing to ensure we aren't handing out experimental code that
hasn't been fully tested e2e w/ the kubernetes project.
 2015-05-21 14:23:25 -04:00
Whit Morriss 52112ad985 make ./kubectl.sh work with juju provider 2015-05-19 10:01:55 -05:00
Whit Morriss 5d19597ffa Add juju action to start petstore example 
This is @chuckbutler's work, with some small fixes

`juju action do kubernetes-master/0 petstore` launches the example code
 2015-05-19 09:47:08 -05:00
Jeff Lowdermilk 553f9f822b Add ga-beacon analytics to gendocs scripts 
hack/run-gendocs.sh puts ga-beacon analytics link into all md files,
hack/verify-gendocs.sh verifies presence of link.
 2015-05-15 18:56:38 -07:00
Daniel Smith ce4b54ec70 Merge pull request #8209 from krousey/v1beta1_cluster 
Removing some v1beta1 uses in cluster/
 2015-05-15 14:56:41 -07:00
Kris Rousey 98c457c397 Updating /cluster to use v1beta 3 specs, and change a lot of polling to 
healthz instead of api endpoints.
 2015-05-15 14:17:55 -07:00
Matt Bruzek 985375e82b Changing hooks.py back to executable. 2015-05-14 16:51:55 -05:00
Matt Bruzek d8b9e2e184 Fixing the permissions on python files. 2015-05-14 15:02:22 -05:00
Eric Paris f416289a85 update all python with boilerplate 2015-05-04 18:37:47 -04:00
Eric Paris 6b3a6e6b98 Make copyright ownership statement generic 
Instead of saying "Google Inc." (which is not always correct) say "The
Kubernetes Authors", which is generic.
 2015-05-01 17:49:56 -04:00
Matt Bruzek 74c00d431e Removing unused scripts from km and kubernetes. 2015-04-30 09:27:51 +02:00
Matt Bruzek ee2d43ac35 Changing the copyright to the Google. 2015-04-22 16:41:03 -05:00
Matt Bruzek dce5f28a63 Changing the copyright to the Google. 2015-04-22 16:40:16 -05:00
Matt Bruzek cdc671a86f Setting the default release number to v0.15.0 2015-04-22 16:39:36 -05:00
Matt Bruzek b69792535d Updating guestbook with the v1beta3 json files. 2015-04-22 15:05:46 -05:00
Matt Bruzek b4766bb380 Removing unneeded status check before juju deployer 2015-04-22 14:45:50 -05:00
Matt Bruzek 450f1f0215 Using readlink instead of realpath. 2015-04-22 12:53:30 -05: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
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
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