Commit Graph

881 Commits (015bc3d60d9ae3f8bb4b6cdc615d23ed086c28ba)

Author SHA1 Message Date
Minhan Xia 174d327695 bump cni version again 2016-05-04 16:28:04 -07:00
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
Lukasz Zajaczkowski 5b84667dd6 Merge pull request #10 from ctrlaltdel/openstack-provider-ssl-fix
Expose /etc/pki from host to kube-apiserver and controller-manager
2016-04-29 09:22:47 +02:00
Lukasz Zajaczkowski 895c543c8c Add missing single speech mark after rebase 2016-04-29 08:16:23 +02:00
Francois Deppierraz dd786794e9 Expose /etc/pki from host to kube-apiserver and controller-manager
CentOS 7 Core nodes running on OpenStack with an SSL-enabled API
endpoint results in the following error without this patch:

F0425 19:00:58.124520       5 server.go:100] Cloud provider could not be initialized: could not init cloud provider "openstack": Post https://my.openstack.cloud:5000/v2.0/tokens: x509: failed to load system roots and no roots provided

The root cause is that the ca-bundle.crt file is actually a symlink
which points to a directory which wasn't previously exposed.

[root@kubernetesstack-master ~]# ls -l /etc/ssl/certs/ca-bundle.crt
lrwxrwxrwx. 1 root root 49 18 nov 11:02 /etc/ssl/certs/ca-bundle.crt -> /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
[root@kubernetesstack-master ~]#
2016-04-28 23:07:24 +02:00
Elson O Rodriguez 9226cf7460 Undoing regression of #23311 2016-04-28 14:06:30 +02:00
Elson O Rodriguez 545b230851 Adding socat package for Redhat systems in Salt 2016-04-28 14:06:30 +02:00
Elson O Rodriguez 001678991b Removing an invalid reference to cadvisor from salt.
It looks like this was left over from https://github.com/kubernetes/kubernetes/pull/23316
2016-04-28 14:06:30 +02:00
Elson O Rodriguez 5ae161e086 Adding cloudprovider support for Openstack kube-up provider.
Making the assumption that the person running kube-up has their
Openstack environment setup, those same variables are being passed
into heat, and then into openstack.conf.

The salt codebase was modified to add openstack as well.
2016-04-28 14:06:29 +02: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
Prashanth Balasubramanian b066cb5357 Templatize l7 rc 2016-04-20 16:15:22 -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
k8s-merge-robot 886c943379 Merge pull request #22367 from a-robinson/requests
Auto commit by PR queue bot
2016-03-05 06:18:14 -08:00
k8s-merge-robot 271784e5fa Merge pull request #21167 from andyzheng0831/trusty-release
Auto commit by PR queue bot
2016-03-05 01:57:52 -08:00
k8s-merge-robot 57c944caa2 Merge pull request #22434 from justinsb/aws_docker_babysitter
Auto commit by PR queue bot
2016-03-04 21:52:03 -08:00
Zach Loafman 60e1fccc7f Regional registries: Hack the manifests!
Allow the gcr.io/google_containers registry to be overridden
regionally by just blasting a new KUBE_ADDON_REGISTRY out. Instead of
adding every addon to Salt and asking all of the other consumers
(Trusty, Juju, Mesos, etc) to change, just script the sed ourselves.

This is probably the 9th grossest thing I've ever done, but it works
well, and it works quickly. I kind of wish it didn't.
2016-03-04 20:00:54 -08:00
Abhi Shah 506f4d2212 Merge pull request #22551 from dchen1107/test1
Enable --log-level=info for docker daemons for scalability jenkins jo…
2016-03-04 16:50:19 -08:00
Alex Robinson 3216204668 Update to the latest version of google-fluentd.
It includes some performance improvements for parsing JSON (which is
very important for us, since all Docker logs are JSON) as well as a
couple new settings, like forcing of a flush of multiline logs after a
time period rather than having to wait until a new log is seen before
feeling confident flushing the previous one.
2016-03-05 00:18:31 +00:00
Alex Robinson 4e729c6c7c Reconfigure fluentd's resource limits and requests.
-Remove CPU limits to enable CPU bursting once 1.2 begins enforcing CPU limits.
-Add a memory limit for fluentd-es to match fluentd-gcp.
-Explicitly set requests to match limits.
2016-03-04 16:16:35 -08:00
k8s-merge-robot 23aa8565e2 Merge pull request #20851 from vmware/vsphere-docker-version-fix
Auto commit by PR queue bot
2016-03-04 15:50:36 -08:00
Dawn Chen fd10ca2f45 Enable --log-level=info for docker daemons for jenkins jobs and e2e tests except soak-continuous. 2016-03-04 13:31:42 -08:00
Andy Zheng 242b9977c7 Remove manifest copies from Trusty support
This change revises the way to provide kube-system manifests for clusters on Trusty. Originally, we maintained copies of some manifests under cluster/gce/trusty/kube-manifests, which is not scalable and hard to maintain. With this change, clusters on Trusty will use the same source of manifests as ContainerVM. This change also fixes some minor problems such as shell variables and comments to meet the style guidance better.
2016-03-04 11:16:49 -08:00
Justin Santa Barbara 6bdab05d11 Salt: Don't use Salt to start Docker
Starting docker through Salt has always been problematic.  Kubelet or
the babysitter process should start it.  We've kept it around primarily
so we have a `service: docker` node for the Salt DAG.

Instead, we enable (but do not start) the Docker service in Salt.  This
lets us keep the DAG node, but won't start it.

There's another bug in Salt, where watches will start the service even
on `service.enabled`.  So we remove the watches, and move them to our
existing Salt bug-fix script.
2016-03-04 12:07:10 -05:00
Justin Santa Barbara dbff0ef67b Systemd/non-Redhat: Add docker healthcheck script
We do the equivalent of #21727 for systemd systems.

Issue #21731
2016-03-04 12:05:52 -05:00
Justin Santa Barbara 64f1cbaddd Systemd/non-Redhat: Add docker prestart file
We do the equivalent of #21727 for systemd systems.

Issue #21731
2016-03-04 12:05:52 -05:00
Justin Santa Barbara d074b5ba13 docker systemd file: type->notify, docs->https
This minimizes the changes we make to the official Docker systemd file.
2016-03-04 12:05:52 -05:00
Alex Robinson 29eb6020fb Merge pull request #22074 from a-robinson/images
Update the logging images to parse sub-second docker timestamps.
2016-03-04 09:04:33 -08:00
k8s-merge-robot 09313b0847 Merge pull request #22254 from vmware/vsphere-pod-cidr-fix
Auto commit by PR queue bot
2016-03-04 04:17:44 -08:00
k8s-merge-robot 6d690d3f8a Merge pull request #21904 from justinsb/salt_docker_install_fix
Auto commit by PR queue bot
2016-03-03 22:07:14 -08:00
Jeff Lowdermilk 93e14a63e8 Revert "Enable --log-level=info for docker daemons for scalability jenkins jo…" 2016-03-03 19:21:11 -08:00
Jeff Lowdermilk 7215860ecd Merge pull request #22453 from dchen1107/test1
Enable --log-level=info for docker daemons for scalability jenkins jo…
2016-03-03 16:29:34 -08:00
Dawn Chen 84689a7a69 Enable --log-level=info for docker daemons for scalability jenkins job and e2e test. 2016-03-03 11:11:56 -08:00
Alex Robinson feea376b5c Update the logging images to parse sub-second docker timestamps. 2016-03-03 10:21:30 -08:00
Justin Santa Barbara 4ce0f8ccec Salt: bypass Salt when installing docker package on debian
The Docker 1.9.1 package on Debian is broken, and the service fails to
install when run unattended.  This is treated as an installation failure
and causes everything to fail.

However, the service can be started by Salt once we're not installing
the package, and indeed we restart docker anyway.

So, on Debian, use a helper script to install the docker package.  The
script sets up a policy-rc.d file to prevent the service starting, and
then cleanly removes it afterwards (this would be difficult to do in
Salt, I believe).
2016-03-03 11:14:33 -05:00
Zach Loafman 820842036b Show LICENSES in /etc/motd
Plumb through from the server tarball to
/usr/local/share/docs/kubernetes/LICENSES, then display in the motd.
2016-03-02 15:23:17 -08:00
Dhawal Yogesh Bhanushali fe7568d099 cidr-fix for vsphere cloud provider
let kubelet configure cbr0 bridge.
let kube-controll-manager distributed the subnet across the nodes.
create routes for the pod network.
2016-03-02 12:52:56 -08:00
Dawn Chen 960bea324e set --babysit-daemons=true for gce and aws 2016-03-01 16:46:31 -08:00
Dawn Chen a90ac42dd8 Kill docker daemon after configing cbr0 if flag --babysit-daemon is true so that babysitter process can restart it again with proper configurations and checkpoint file. 2016-03-01 16:46:31 -08:00
k8s-merge-robot a0b04a6df8 Merge pull request #20281 from cilium-team/fixing-docker-d
Auto commit by PR queue bot
2016-02-28 03:51:31 -08:00
Prashanth Balasubramanian 7d47d2dcd8 Kube-proxy requests 2x cpu shares of addons. 2016-02-25 15:39:27 -08:00
Justin Santa Barbara 977a4a56e4 AWS Debian Jessie: Install Docker 1.9.1 2016-02-22 22:55:11 -05:00
Prashanth B c833a14898 Merge pull request #21727 from dchen1107/test
Remove potential corrupted docker network checkpoint file before star…
2016-02-22 17:52:16 -08:00
Dawn Chen d922ddef8c Remove potential corrupted docker network checkpoint file before start docker
again.
2016-02-22 17:08:31 -08:00
k8s-merge-robot 8afccef608 Merge pull request #21632 from justinsb/docker_191
Auto commit by PR queue bot
2016-02-22 16:16:51 -08:00
Dhawal Yogesh Bhanushali e1a7441b36 restricting the version of docker to 1.9.x for vsphere support
for vsphere provider docker currently only supports 1.9.1 release.
The older versions of docker are failing on jessie due to issue https://github.com/docker/docker/issues/18793
and newer version 1.10.x is not properly tested.
2016-02-22 16:03:17 -08:00
Jeff Lowdermilk c406665b2b Plumb node labels through salt
Expose node-labels flag on kubelet for gce via a startup script
env var.
2016-02-22 15:31:34 -08:00
Dawn Chen 699c80b752 Merge pull request #21641 from bprashanth/promisc
Teach the kubelet about promiscuous mode, take 2
2016-02-22 15:08:18 -08:00
Dawn Chen b58826292a Merge pull request #21703 from dchen1107/test
Make sure docker is properly shutdown before startup.
2016-02-22 13:35:24 -08:00
Dawn Chen 6c5f07d58e Make sure docker is properly shutdown before startup. 2016-02-22 12:57:42 -08:00
k8s-merge-robot e629ee6bd3 Merge pull request #20704 from FujitsuEnablingSoftwareTechnologyGmbH/centos-support
Auto commit by PR queue bot
2016-02-22 02:35:22 -08:00
Lukasz Zajaczkowski 82be3d08f3 Add CentOS support 2016-02-22 07:41:35 +01:00
k8s-merge-robot facd8617ce Merge pull request #21505 from bprashanth/flannel-etcd
Auto commit by PR queue bot
2016-02-21 18:09:12 -08:00
Prashanth Balasubramanian c97e8df65b Stricter checking of HAIRPIN_FLAG in salt. 2016-02-21 14:43:43 -08:00