Commit Graph

111 Commits (57604d13cd7e9985e520511efc5b3b3b3dd62000)

Author SHA1 Message Date
Kubernetes Submit Queue 4348190b8a Merge pull request #31794 from chuckbutler/messaging-uniformity
Automatic merge from submit-queue

move '(master)' to end of message for uniformity

**What this PR does / why we need it**: This is a small polish operation on the kubernetes charm wrt juju status output.


**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
NONE
```

This changes the status output from:

```
kubernetes/0  active    idle   3        172.27.24.54    8088/tcp
Kubernetes running.
kubernetes/1  active    idle   4        172.27.24.55    6443/tcp
(master) Kubernetes services started
```
 to this:
 ```
 kubernetes/0  active    idle   3        172.27.24.54    8088/tcp
 Kubernetes running.
 kubernetes/1  active    idle   4        172.27.24.55    6443/tcp
 Kubernetes services started (master)
 ```
2016-09-06 15:04:56 -07:00
Charles Butler ff2478042a Fixes the master messaging
Resolves #32010
2016-09-02 16:57:07 -05:00
Charles Butler 9cf5952ab7 move '(master)' to end of message for uniformity
This changes the status output from:

```
kubernetes/0  active    idle   3        172.27.24.54    8088/tcp
Kubernetes running.
kubernetes/1  active    idle   4        172.27.24.55    6443/tcp
(master) Kubernetes services started
```
 to this:
 ```
 kubernetes/0  active    idle   3        172.27.24.54    8088/tcp
 Kubernetes running.
 kubernetes/1  active    idle   4        172.27.24.55    6443/tcp
 Kubernetes services started (master)
 ```
2016-08-31 10:42:30 -05:00
MrHohn f1ff86f189 Build and push kube-dns for 1.4 release 2016-08-24 21:21:52 -07:00
Jan Safranek 5f6efefc40 [squash] Rename and move to storageclass/ 2016-08-22 14:11:01 +02:00
Jan Safranek 82d35fb461 Add admission controller for default storage class.
The admission controller adds a default class to PVCs that do not require any
specific class. This way, users (=PVC authors) do not need to care about
storage classes, administrator can configure a default one and all these PVCs
that do not care about class will get the default one.
2016-08-18 18:55:35 +02:00
Kubernetes Submit Queue ea69570f61 Merge pull request #30092 from mbruzek/juju-util-fixes
Automatic merge from submit-queue

Juju util fixes

The util.sh file was out of date and caused the kube-up script to error out. This work fixes #23198
```release-note
* Updating the util.sh for the juju provider kube-up.sh 
```

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30092)
<!-- Reviewable:end -->
2016-08-10 17:09:52 -07:00
Matt Bruzek 56fc1f23f2 Edits to bring the new etcd cluster to the layer. 2016-08-04 16:14:00 -05:00
Matt Bruzek 1d3b52fd9f Fixing identification script and adding output to ignore. 2016-08-04 19:18:07 +00:00
Matt Bruzek b9ac078be7 Updating the util.sh script to work with latest version of juju. 2016-08-04 12:04:16 -05:00
Matt Bruzek d97157f7a4 Adding back in the kube_master_url that came up in testing. 2016-08-03 16:11:47 -05:00
Matt Bruzek 34dca937b4 Replacing skydns with kubedns for the juju cluster. #29720 2016-08-02 16:49:27 -05:00
joe2far 5ead89b5bb Fixed several typos 2016-07-13 15:06:24 +01:00
k8s-merge-robot 203e1e9663 Merge pull request #26446 from mbruzek/juju-master-worker
Automatic merge from submit-queue

Implementing a proper master/worker split in the juju cluster code.

```
release-note-none
```

General updates to the cluster/juju Kubernetes provider, to bring it up to date.

Updating the skydns templates to version 11
Updating the etcd container definition to include arch.
Updating the master template to include arch and version for hyperkube container.
Adding dns_domain configuration options.
Adding storage layer options.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-05 18:50:40 -07:00
Matt Bruzek b45002b2b2 Implementing a proper master/worker split in k8s.py
Updating the skydns templates to version 11
Updating the etcd container definition to include arch.
Updating the master template to include arch and version for hyperkube container.
Adding dns_domain configuration options.
Adding storage layer options.
Fixing underscore problem and adding exceptions.

Fixing the underscore flag errors.
2016-07-05 11:16:41 -05:00
David McMahon ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
mattyw 3c44752931 cluster/juju: Updated the url for the getting started doc 2016-05-16 20:56:17 +01:00
Matt Bruzek 64d849e4bb Unzipping the kubectl package to platforms so the validation script can find kubectl. 2016-04-01 13:19:17 -05:00
Charles Butler cc1fb15ef7 Updating documentation link to point to k8s.io/docs/ 2016-03-23 12:26:37 -04:00
Charles Butler 54050dbaef Fetch the guestbook action from master for now 2016-03-23 12:22:39 -04:00
Charles Butler b014c0d6b7 Move to the ~containers namespace etcd 2016-03-23 12:22:10 -04:00
Charles Butler dafc78b489 Removing the duplicated guestbook example files 2016-03-23 12:21:01 -04:00
Charles Butler fb2f952867 fixing for jinja2 syntax 2016-03-16 14:25:26 -04:00
Charles Butler 0c86318b7d Changes made by running hack/update-generated-docs.sh 2016-03-16 14:25:26 -04:00
Charles Butler ce5a189234 Fix file headers for License bot 2016-03-16 14:25:26 -04:00
Charles Butler ba113ea30b Rework `cluster/juju` to reflect current work
This commit imports the latest development focus from the Charmer team
working to deliver Kubernetes charms with Juju.

Notable Changes:

- The charm is now assembled from layers in $JUJU_ROOT/layers
- Prior, the juju provider would compile and fat-pack the charms, this
  new approach delivers the entirety of Kubernetes via hyperkube.
- Adds Kubedns as part of `cluster/kube-up.sh` and verification
- Removes the hard-coded port 8080 for the Kubernetes Master
- Includes TLS validation
- Validates kubernetes config from leader charm
- Targets Juju 2.0 commands
2016-03-16 14:25:26 -04:00
Charles Butler a750bf667f Wipe the old charm(s) 2016-03-16 14:25:26 -04:00
k8s-merge-robot 1ce188e557 Merge pull request #21430 from spxtr/e2e-internal
Auto commit by PR queue bot
2016-02-21 12:08:22 -08:00
Joe Finney 2b756ca56d Move E2E kube-up call into test-setup from e2e-internal. 2016-02-17 16:49:07 -08:00
laushinka 7ef585be22 Spelling fixes inspired by github.com/client9/misspell 2016-02-18 06:58:05 +07:00
Paul Morie 05bd107301 Add boilerplate checks for Makefiles 2016-02-03 18:35:26 -05:00
Federico Gimenez b677d94bb9 Added --allow-privileged flag to kubelet and apiserver init command 2015-12-19 15:47:41 +01:00
k8s-merge-robot b69018eab2 Merge pull request #17844 from eosrei/kube-util-minion-node
Auto commit by PR queue bot
2015-12-02 03:06:27 -08:00
jiangyaoguo a739fc44c4 keep kubeproxy hostname consistent with kubelet 2015-11-28 10:47:29 +08:00
Brad Erickson 0bd16e0437 Minion->Node rename: kube-util hosting provider helper functions 2015-11-26 09:31:46 -08:00
Brad Erickson 53172a5356 Minion->Node rename: NUM_NODES 2015-11-25 00:45:10 -08:00
Brad Erickson ae314ad246 Minion->Node rename: KUBE_NODE_IP_ADDRESSES, KUBE_NODE_IP_ADDRESS 2015-11-25 00:43:52 -08:00
Matt Bruzek ed64773c9c Fixing the errors with verify-boilerplate. 2015-10-09 11:13:28 -05:00
Matt Bruzek 0d577b8e03 Update the code to be in sync and pass CI tests. 2015-10-09 09:54:52 -05:00
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