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

27362 Commits (31de62216dea226f0553e698da38000b73684d49)

Author SHA1 Message Date
k8s-merge-robot 31de62216d Merge pull request #23381 from kinvolk/alban/apache-log 
Automatic merge from submit-queue

examples/guestbook/php-redis: don't reopen stdio fds

/etc/apache2/apache2.conf was configured to log in this way:
> ErrorLog /proc/self/fd/2
> CustomLog /proc/self/fd/1 combined

This causes apache to reopen the already-opened fds. It works fine when
the file descriptors are pipes or ttys but it fails when they are Unix
sockets because sockets cannot be opened with the open() syscall. The
issue happens when apache is connected to systemd-journald, like in the
rkt container run-time.

This patch uses "cat" to directly write to the stdio fds without
reopening them. apache2.conf now looks like:
> ErrorLog "|$/bin/cat 1>&2"
> CustomLog "|/bin/cat" combined

It works both with Docker and rkt (tested with and without
--interactive).

Symptoms:
> [ 2673.478868] apache2-foreground[4]: (6)No such device or address:
> AH00091: apache2: could not open error log file /proc/self/fd/2.

See also: https://github.com/coreos/rkt/issues/2300

-----

/cc @sjpotter @yifan-gu @jonboulle
 2016-04-11 16:58:23 -07:00
David McMahon fbe5f70267 Update CHANGELOG.md for v1.3.0-alpha.2. 2016-04-11 12:54:06 -07:00
Jeff Grafton 391ff9dba6 Merge pull request #24105 from ixdy/dirty-workspace 
Remove "dirty workspace" check in e2e-runner.sh
 2016-04-11 12:14:09 -07:00
Jeff Grafton 1816582fda Remove "dirty workspace" check in e2e-runner.sh 2016-04-11 12:02:14 -07:00
Jeff Grafton 94d4a3eca3 Merge pull request #24010 from ixdy/dockerized-e2e 
Run kubernetes-e2e-g[ck]e-flaky inside Docker
 2016-04-11 11:36:18 -07:00
k8s-merge-robot bf0e6e0047 Merge pull request #23261 from hongchaodeng/sched 
Automatic merge from submit-queue

kube-scheduler: cleanup duplicate GetAlgorithmProvider()

See [here](ae88f08af0/plugin/pkg/scheduler/factory/factory.go (L177-L180)).
The check is duplicate since CreateFromProvider will also do it.
 2016-04-11 10:01:16 -07:00
Isaac Hollander McCreery f9ffeb8244 Merge pull request #24077 from ihmccreery/upgrade-version-1.1 
Fix upgrade jobs again
 2016-04-11 09:52:46 -07:00
k8s-merge-robot 6a87dba0b8 Merge pull request #22733 from resouer/flow-control 
Automatic merge from submit-queue

Add flow control pkg

minor fix ref #15634
Refactor pkg names in back off related files
 2016-04-11 06:18:51 -07:00
k8s-merge-robot 78dc9c7716 Merge pull request #19376 from luxas/dns_cross_platform 
Automatic merge from submit-queue

Make kube2sky and skydns docker images cross-platform

ARM tracking issue: #17981
Continues on: #19216

Make it possible to create `kube2sky` and `skydns` docker images for ARM and other architectures too
Build in a container, so `golang` isn't a dependency
I've preserved the original default behaviour:
 - `skydns`: It just compiles with go on host
 - `kube2sky`: Build an image

@brendandburns @dchen1107 @ArtfulCoder @thockin @fgrzadkowski
 2016-04-11 05:47:10 -07:00
k8s-merge-robot 96a32fda4e Merge pull request #23949 from mikebrow/development-guide-update 
Automatic merge from submit-queue

Minor doc edits to development.md 

Noted a few small clarity issues going through the development guide and while it mentioned local builds, it was missing instructions for building on a local go developer environment.  

Signed-off-by: mikebrow <brownwm@us.ibm.com>
 2016-04-11 05:14:59 -07:00
Wojciech Tyczynski cd2de7d4cd Merge pull request #23741 from wojtek-t/conversions_with_framework_5 
Small improvements in conversion generator
 2016-04-10 22:51:26 -07:00
Wojciech Tyczynski 6d954a1490 Merge pull request #23871 from smarterclayton/proto_timestamp 
Implement a simpler unversioned.Time serialization
 2016-04-10 22:47:49 -07:00
Lucas Käldström 1c8140c2ac Make kube2sky and skydns docker images cross-platform: amd64, arm, arm64 and ppc64le 2016-04-11 07:31:59 +03:00
k8s-merge-robot e31177219b Merge pull request #23962 from fejta/test-cmd 
Automatic merge from submit-queue

Update hack/test-cmd.sh to use tagged, gcr.io images

Migrate hack/test-cmd.sh and related test data to use tagged, gcr.io versions of the images for #13288 and #20836
 2016-04-09 20:37:45 -07:00
k8s-merge-robot 7ed19f7fde Merge pull request #24054 from nikhiljindal/typeObject 
Automatic merge from submit-queue

Allowing type object in kubectl swagger validation

Allowing `"type": "object"` in kubectl swagger validation.

We will cherrypick this in 1.2
This allows 1.2 kubectl to work with 1.3 api server which will use `"type":"object"` instead of `"type":"any"`.
Ref https://github.com/kubernetes/kubernetes/issues/4700#issuecomment-194719759

cc @bgrant0607
 2016-04-09 14:52:35 -07:00
Jeff Lowdermilk 524bfde377 Merge pull request #23883 from liggitt/attis 
Externalize immortal namespaces
 2016-04-08 20:56:04 -07:00
Jeff Lowdermilk cd85b06465 Merge pull request #24001 from freehan/kubenet 
include error in the fail msg
 2016-04-08 20:55:35 -07:00
Jeff Lowdermilk 1a9cb97bdd Merge pull request #23658 from Random-Liu/fix-termination-message-path 
Fix TerminationMessagePath
 2016-04-08 20:54:14 -07:00
Jeff Lowdermilk 347158e520 Merge pull request #23680 from rosskukulinski/master 
Add KUBERNETES_RELEASE option to get-kube.sh
 2016-04-08 20:53:47 -07:00
Jeff Lowdermilk 2dd9bf535f Merge pull request #23723 from intelsdi-x/stage1_image_rkt_deprecated_flag 
keep deprecated flag stage1-image with rkt
 2016-04-08 20:53:09 -07:00
Isaac Hollander McCreery a2fc84878e Use 1.1 as published version for experimental upgrade jobs 2016-04-08 17:31:10 -07:00
nikhiljindal b476ee4b12 Allowing type object in kubectl swagger validation 2016-04-08 17:26:35 -07:00
Jeff Grafton fde3545351 Use dockerized e2e for g[ck]e-flaky jobs, and run on the Jenkins slave 
Force all other e2e jobs to run on master.
 2016-04-08 16:45:00 -07:00
Jeff Grafton 253711016e Make e2e-runner.sh work inside Docker and add wrapper script 2016-04-08 16:42:09 -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 3a1767fda0 Merge pull request #23649 from ihmccreery/release-pin 
Create test job against release/latest on GKE
 2016-04-08 16:38:42 -07:00
Erick Fejta c304f5ea06 Merge pull request #24073 from fejta/jenkslow 
Increase *-slow workflow timeouts to 150 as avg runtime is 50m
 2016-04-08 16:11:28 -07:00
Erick Fejta 7d2055a762 Increase *-slow workflow timeouts to 150 as avg runtime is 50m 2016-04-08 15:54:49 -07:00
Jeff Lowdermilk 2fb745f01d Merge pull request #23661 from spxtr/oidc 
Remove retries from most oidc tests.
 2016-04-08 14:33:34 -07:00
Jeff Lowdermilk c3dac2d18b Merge pull request #23449 from swagiaal/pv-recycle-race-logging 
Add loging to the recently recycled PV section
 2016-04-08 13:30:23 -07:00
Jeff Lowdermilk ade0e30313 Merge pull request #23814 from vbehar/fix_typo 
fix typo (in godoc)
 2016-04-08 12:57:15 -07:00
Jeff Lowdermilk 9ee4d79a62 Merge pull request #23821 from spxtr/retry-404 
Retry the cloudsdk gsutil copy.
 2016-04-08 12:56:28 -07:00
Jeff Lowdermilk 8b6ab71901 Merge pull request #23760 from spxtr/disable-jobs 
Disable autoscaling Jenkins job.
 2016-04-08 12:54:41 -07:00
Jeff Lowdermilk 27bca83304 Merge pull request #23963 from spxtr/services-slow 
Mark services test slow.
 2016-04-08 12:47:45 -07:00
Jeff Lowdermilk 7720a16bcf Merge pull request #23893 from mbhinder/kubernetes 
Fixed typo: kuberntes -> kubernetes
 2016-04-08 12:47:36 -07:00
Jeff Lowdermilk c9355df584 Merge pull request #24050 from spxtr/fix-travis 
Fix travis go version.
 2016-04-08 12:46:55 -07:00
Jeff Lowdermilk d8f42f848d Merge pull request #23996 from andyzheng0831/fix 
Trusty: Do not create the docker-daemon cgroup
 2016-04-08 12:45:16 -07:00
Jeff Lowdermilk 653bc04eb2 Merge pull request #24032 from ixdy/update-job 
Only keep 7 days' worth of logs for kubernetes-update-jenkins-jobs
 2016-04-08 12:44:29 -07:00
Jeff Lowdermilk c0567e3b5f Merge pull request #24046 from ihmccreery/fix-upgrade-splits 
Fix upgrade tests
 2016-04-08 12:43:51 -07:00
Jeff Lowdermilk 601262af0d Merge pull request #24058 from jlowdermilk/fix-list-resources 
Fix list-resources grep
 2016-04-08 12:41:40 -07:00
Jeff Lowdermilk 650d99fbd9 Fix list-resources grep 2016-04-08 12:19:24 -07:00
Joe Finney 044462e3c4
Fix travis go version. 2016-04-08 10:10:31 -07:00
Jeff Lowdermilk 48ea7cae48 Merge pull request #23970 from fejta/slow 
Increase standard e2e suite timeout to 50m, twice mean runtime
 2016-04-08 09:33:32 -07:00
Jeff Lowdermilk 9be85fbaf0 Merge pull request #23541 from bprashanth/fw_default 
Default firewall port to TCP when unspecified.
 2016-04-08 09:32:00 -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
Jeff Lowdermilk f41f5dc823 Merge pull request #23853 from janetkuo/revert-rollingupdate-latest 
Revert "rolling update will check whether the image is distinct or not, however the image with tag latest should be excluded"
 2016-04-08 09:29:32 -07:00
Isaac Hollander McCreery 1c28cf016c Fix upgrade tests 2016-04-08 08:28:18 -07:00
Jeff Grafton c924f5aa87 Only keep 7 days' worth of logs for kubernetes-update-jenkins-jobs 2016-04-08 00:21:47 -07:00
Tim Hockin df055333ef Merge pull request #23863 from thockin/logo-blue-name 
Render the logo name in blue
 2016-04-07 23:48:26 -07:00
k8s-merge-robot 0944f3fa2e Merge pull request #24017 from david-mcmahon/v122 
Automatic merge from submit-queue

Release notes for v1.2.2.

cc @bgrant0607 @zmerlynn @jlowdermilk @cjcullen
 2016-04-07 19:05:19 -07:00