Commit Graph

822 Commits

Author SHA1 Message Date
k8s-merge-robot
963aebd3e5 Merge pull request #25123 from jlewi/jessie
Automatic merge from submit-queue

Add an entry to the salt config to allow Debian jessie on GCE.

```release-note
Add an entry to the salt config to allow Debian jessie on GCE.

As with the existing Wheezy image on GCE, docker is expected
to already be installed in the image.
```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-04 04:22:39 -07:00
k8s-merge-robot
dcc2a400d0 Merge pull request #25115 from freehan/bumpcni
Automatic merge from submit-queue

bump cni binary
2016-05-04 03:07:06 -07:00
Jeremy Lewi
ccf4b381db Add an entry to the salt config to allow Debian jessie on GCE.
As with the existing Wheezy image on GCE, docker is expected
to already be installed in the image.
2016-05-03 22:17:38 -07:00
Minhan Xia
87c66c517d bump cni binary 2016-05-03 17:18:26 -07:00
k8s-merge-robot
7a09fbcf97 Merge pull request #24210 from cjcullen/abacAuth
Automatic merge from submit-queue

Switch to ABAC authorization from AllowAll

Switch from AllowAll to ABAC. All existing identities (that are created by deployment scripts) are given full permissions through ABAC. Manually created identities will need policies added to the `policy.jsonl` file on the master.
2016-04-27 16:43:08 -07:00
k8s-merge-robot
9fd05474c2 Merge pull request #24108 from mikedanese/kube-addon-cleanup
Automatic merge from submit-queue

don't source the kube-env in addon-manager

This was added in 2feb658ed7 which became unused after #23603 but wasn't removed
2016-04-27 16:07:54 -07:00
CJ Cullen
3253739505 Use ABAC authz instead of AllowAll. 2016-04-27 11:38:15 -07:00
k8s-merge-robot
3fa84134cd Merge pull request #24124 from vmware/photon-controller
Automatic merge from submit-queue

Initial kube-up support for VMware's Photon Controller

This is for: https://github.com/kubernetes/kubernetes/issues/24121

Photon Controller is an open-source cloud management platform. More
information is available at:
http://vmware.github.io/photon-controller/

This commit provides initial support for Photon Controller. The
following features are tested and working:
- kube-up and kube-down
- Basic pod and service management
- Networking within the Kubernetes cluster
- UI and DNS addons

It has been tested with a Kubernetes cluster of up to 10
nodes. Further work on scaling is planned for the near future.

Internally we have implemented continuous integration testing and will
run it multiple times per day against the Kubernetes master branch
once this is integrated so we can quickly react to problems.

A few things have not yet been implemented, but are planned:
- Support for kube-push
- Support for test-build-release, test-setup, test-teardown

Assuming this is accepted for inclusion, we will write documentation
for the kubernetes.io site.

We have included a script to help users configure Photon Controller
for use with Kubernetes. While not required, it will help some
users get started more quickly. It will be documented.

We are aware of the kube-deploy efforts and will track them and
support them as appropriate.
2016-04-27 01:02:03 -07:00
Alain Roy
fa9d79df75 Initial kube-up support for VMware's Photon Controller
This is for: https://github.com/kubernetes/kubernetes/issues/24121

Photon Controller is an open-source cloud management platform. More
information is available at:
http://vmware.github.io/photon-controller/

This commit provides initial support for Photon Controller. The
following features are tested and working:
- kube-up and kube-down
- Basic pod and service management
- Networking within the Kubernetes cluster
- UI and DNS addons

It has been tested with a Kubernetes cluster of up to 10
nodes. Further work on scaling is planned for the near future.

Internally we have implemented continuous integration testing and will
run it multiple times per day against the Kubernetes master branch
once this is integrated so we can quickly react to problems.

A few things have not yet been implemented, but are planned:
- Support for kube-push
- Support for test-build-release, test-setup, test-teardown

Assuming this is accepted for inclusion, we will write documentation
for the kubernetes.io site.

We have included a script to help users configure Photon Controller
for use with Kubernetes. While not required, it will help some
users get started more quickly. It will be documented.

We are aware of the kube-deploy efforts and will track them and
support them as appropriate.
2016-04-25 13:24:16 -07:00
Mike Danese
e095f8c377 don't source the kube-env in addon-manager 2016-04-20 09:44:44 -07:00
CJ Cullen
760568796f Masquerade traffic from off-cluster going through kube-proxy. 2016-04-19 21:39:34 -07:00
k8s-merge-robot
273b01dceb Merge pull request #23975 from zhouhaibing089/kubectl-fix
Automatic merge from submit-queue

add HOME env variable for kube-addons service

Fix https://github.com/kubernetes/kubernetes/issues/23973.

Briefly, systemd service does not know the `HOME` environment variable which causes the kubectl write schema file into `/.kube` while it is expected to be `/root/.kube`.
2016-04-17 13:12:53 -07:00
k8s-merge-robot
7e2b795a36 Merge pull request #24293 from mikedanese/componentlabels
Automatic merge from submit-queue

add labels to kube component static pods

```
$ k --namespace=kube-system get po -l 'tier in (control-plane)' 
NAME                                 READY     STATUS    RESTARTS   AGE
kube-apiserver-k-7-master            1/1       Running   2          1m
kube-controller-manager-k-7-master   1/1       Running   1          1m
kube-scheduler-k-7-master            1/1       Running   0          54s
$ k --namespace=kube-system get po -l 'tier in (node)'         
NAME                         READY     STATUS    RESTARTS   AGE
kube-proxy-k-7-minion-eheu   1/1       Running   0          1m
kube-proxy-k-7-minion-mwo9   1/1       Running   0          1m
kube-proxy-k-7-minion-xw6m   1/1       Running   0          1m
```
cc @bgrant0607 @thockin @gmarek 

Fixes #21267
2016-04-16 03:11:32 -07:00
k8s-merge-robot
16e2e87a89 Merge pull request #23605 from mikedanese/pause-kube
Automatic merge from submit-queue

don't ship kube-registry-proxy and pause images in tars.

pause is built into containervm. if it's not on the machine we should just pull
it. nobody that I'm aware of uses kube-registry-proxy and it makes build/deployment
more complicated and slower.
2016-04-15 00:26:20 -07:00
Mike Danese
6d24ca487a add labels to kube component static pods 2016-04-14 19:13:18 -07:00
k8s-merge-robot
af1e1c3ce6 Merge pull request #23992 from mml/docker-checker
Automatic merge from submit-queue

Rewrite docker-checker.sh to make it less kill-happy.
2016-04-13 10:10:25 -07:00
Matt Liggett
e6af5ee296 Rewrite docker-checker.sh to make it less kill-happy.
Also a little more organized and easier to re-use.
Should minimize the incidence of #23461.
2016-04-11 16:57:29 -07:00
Jeff Lowdermilk
e17213a2a8 Merge pull request #23491 from onorua/master
set KillMode for kubelet to process, fix for #13511
2016-04-08 16:39:32 -07:00
Jeff Lowdermilk
ca5b764210 Merge pull request #23876 from mikedanese/stop-to-delete
use kubectl delete in kube-addon-manager instead of stop
2016-04-08 09:30:56 -07:00
zhouhaibing089
db347beb3f add HOME env variable for kube-addons service 2016-04-07 15:39:22 +08:00
Minhan Xia
f690220b5c Merge pull request #23704 from freehan/kubenet
Update cni binary

#23712 is depending on this. Not sure why this one gets in first. Hand merging this
2016-04-06 15:47:42 -07:00
Mike Danese
7b8dbf4876 use kubectl delete in kube-addon-manager instead of stop
stop has been deprecated for about a year
2016-04-05 09:31:45 -07:00
Mike Danese
32426d6e97 don't ship kube-registry-proxy and pause in tars.
pause is built into containervm. if it's not on the machine we should just pull
it. nobody that I'm aware of uses kube-registry-proxy and it makes build/deployment
more complicated and slower.
2016-04-05 07:32:07 -07:00
Matt Johnson
ce220836c3 Allow for local CNI binaries and configuration files with KUBERNETES_PROVIDER=vagrant.
Files are taken from cluster/network-plugins/{bin,conf} to be consumed within a vagrant kube-up.sh environment.
Paths used for configuration files and the 'cni' name of the network provider are all from the kubernetes documentation, but the actual implementation in the salt automation doesn't seem to exist.
2016-04-04 14:38:00 +01:00
Matt Johnson
46e6df655f Support use of NETWORK_PROVIDER=cni with KUBERNETES_PROVIDER=vagrant for a kube-up.
Use of NETWORK_PROVIDER=cni is documented as useable (as well as it's affects on the runtime args of kubelet),
however the actual implimentation in the salt automation doesnt seem to exist.
this change attempts to fix that for the vagrant usecase.
2016-04-04 14:37:48 +01:00
k8s-merge-robot
5be819b607 Merge pull request #23612 from mikedanese/addon-fix
Automatic merge from submit-queue

use apply instead of create to setup namespaces and tokens in addon manager

when the addon manager restarts, it takes ~15 minutes (1000 seconds) to start the sync loop because it retries creation of namespace and tokens 100 times. Create fails if the tokens already exist. Just use apply.
2016-04-03 05:50:12 -07:00
k8s-merge-robot
b448825211 Merge pull request #23603 from mikedanese/dont-create-secret-for-dns
Automatic merge from submit-queue

stop creating secrets for dns, it uses the kube-system service account now
2016-04-02 17:20:52 -07:00
Minhan Xia
d026d7ecbc Update cni binary 2016-03-31 13:57:51 -07:00
Alex Robinson
b60ef6f0dd Merge pull request #23593 from dchen1107/docker
Remove unnecessary override of /etc/init.d/docker on containervm image.
2016-03-31 13:31:52 -07:00
Alex Robinson
d41d50547d Merge pull request #23662 from ArtfulCoder/dockerscript
make docker-checker more robust
2016-03-31 10:53:39 -07:00
Abhishek Shah
736c02c7a0 make docker-checker more robust 2016-03-31 10:07:37 -07:00
CJ Cullen
26a6c66de5 Change kube-proxy & fluentd CPU request to 20m/80m. 2016-03-30 18:14:24 -07:00
k8s-merge-robot
c327879771 Merge pull request #23512 from Q-Lee/nanny-fix
Automatic merge from submit-queue

Create a new Deployment in kube-system for every version.

It appears that version numbers have already been properly added to these files. Small change to delete an old deployment entirely, so we can make a new one per version (like replication controllers).

We'll want to change this back once the kube-addons support deployments in a later version.
2016-03-29 20:59:46 -07:00
Mike Danese
ffa8bbde72 use apply instead of create to setup namespaces and tokens in addon manager 2016-03-29 16:41:53 -07:00
Mike Danese
0a821a473d stop create secrets for dns, it uses the kube-system service account now 2016-03-29 14:27:28 -07:00
Quintin Lee
0dcd49d584 Create a new Deployment in kube-system for every version. 2016-03-29 13:26:36 -07:00
Dawn Chen
c5ac60f584 Remove unnecessary override of /etc/init.d/docker on containervm image. 2016-03-29 12:35:13 -07:00
k8s-merge-robot
3ec9f1e0a1 Merge pull request #23312 from mikedanese/static-routes-salt
Auto commit by PR queue bot
2016-03-26 12:29:40 -07:00
Yaroslav Molocko
0bfc496496 fix for https://github.com/kubernetes/kubernetes/issues/13511 2016-03-25 22:29:09 +08:00
Mike Danese
be5b669b45 remove cadvisor salt
We have been removing cadviosr.manifest for over a year to cleanup
the old deployment style. I think we are ok at this point.
2016-03-24 11:55:29 -07:00
k8s-merge-robot
cba5efd7de Merge pull request #23311 from mikedanese/nginx-salt
Auto commit by PR queue bot
2016-03-23 04:14:17 -07:00
Quintin Lee
c484563315 Removing versions from deployment names. 2016-03-22 13:17:06 -07:00
Quintin Lee
79f0cc25e8 Support addon Deployments, make heapster a deployment with a nanny. 2016-03-22 13:17:06 -07:00
Mike Danese
c676f8dabb remove unused static-routes from salt 2016-03-21 17:38:08 -07:00
Mike Danese
172d4e27f1 remove unused nginx salt
'aws', 'gce', 'vagrant', 'vsphere' are all the cloud providers
2016-03-21 17:25:31 -07:00
Justin Santa Barbara
e0caa1e559 non_masquerade_cidr: verify-flags exception, salt syntax
Cope is non_masquerade_cidr value is empty; add exception for
verify-flags.
2016-03-15 11:05:55 -04:00
Matt Margolin
e752f2149f Enable non_masquerade_cidr option configured in salt.grains
This should allow allow the non_masquerade_cidr option to get configured
in /etc/salt/minion.d/grains.conf, allowing the flag to used by kubelet
in /etc/sysconfig/kubelet. Default configuration is set in pillar
2016-03-15 09:56:33 -04:00
k8s-merge-robot
5191cfc415 Merge pull request #20931 from gswallow/master
Auto commit by PR queue bot
2016-03-07 06:18:53 -08:00
k8s-merge-robot
bc96422e23 Merge pull request #22571 from zmerlynn/regional-registry
Auto commit by PR queue bot
2016-03-06 13:21:19 -08:00
k8s-merge-robot
0a21fa06d9 Merge pull request #22539 from a-robinson/newf
Auto commit by PR queue bot
2016-03-05 08:26:59 -08:00