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

151 Commits (0274e72d39a2049eb8a57c809fe04686cc75ef7d)

Author SHA1 Message Date
Amy Unruh d4251b2a25 update to use gb-frontend:v4. New image includes the change in PR # 23381. 2016-04-12 09:47:38 -07:00
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
Janet Kuo c1596e6711 Update guestbook examples; replace RC concepts with Deployment 2016-03-30 14:16:52 -07:00
Alban Crequy f6f013b992 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
 2016-03-23 16:01:34 +01:00
David McMahon dae84f5306 Update the latestReleaseBranch to release-1.2 in the munger. 2016-03-08 18:59:28 -08:00
Erick Fejta 6a657e0bc2 Use redis from gcr.io and e2e tag 2016-03-05 20:37:44 -08:00
Amy Unruh 2d8f857a24 Update guestbook frontend php script suggested in issue #18640. 
(Created new GCR image version with the changes).
 2016-02-16 11:05:51 -08:00
Paul Morie b672785d72 Add boilerplate checks for Dockerfiles 2016-02-03 18:35:26 -05:00
k8s-merge-robot 16a78198c3 Merge pull request #17932 from GertiPoppel/DocContribution 
Auto commit by PR queue bot
 2016-01-19 17:15:33 -08:00
Chao Xu 2b2f285777 run hack/update-generated-docs.sh 2015-12-21 10:41:30 -08:00
Amy Unruh b1f99ecdbf config best practices doc edits 2015-12-16 07:35:31 -08:00
Gerti Poppel 03ace3b6b3 auto update 2015-12-01 16:49:46 +01:00
Gerti Poppel aca18b9141 fixed some typos and formatting 2015-12-01 16:46:21 +01:00
Corey Farwell 2dd4f1f40f Fix typo in guestbook README 2015-11-18 11:25:21 -05:00
Tim Hockin dab591b629 Run update-gendocs 2015-11-13 13:57:57 -08:00
Zichang Lin 2afda9f2c1 Update guestbook example according to config best practices 2015-11-07 14:39:32 +08:00
hurf ce35bb4208 Remove trace of "kubectl stop" 
Remove doc and use of "kubectl stop" since it's deprecated.
 2015-10-30 14:12:20 +08:00
Zichang Lin fb373d050b Fix document link 2015-09-23 10:17:05 +08:00
eulerzgy a245aa59e6 fix document 2015-09-12 22:49:13 +08:00
k8s-merge-robot 4f84e3f779 Merge pull request #13758 from amygdala/gb2 
Auto commit by PR queue bot
 2015-09-09 17:03:04 -07:00
Chao Xu 183c6e2e84 Merge pull request #13652 from clasohm/example_download_links_raw 
add raw flag for GitHub download links
 2015-09-09 16:19:14 -07:00
Amy Unruh d531f0fd8b Update the frontend image to a version that uses relative URLs. 
Update image names in the README.
 2015-09-09 13:20:48 -07:00
Carsten Clasohm d093fe0c4b add raw flag for GitHub download links 2015-09-07 17:43:09 -07:00
Amy Unruh 3574999fa3 Use GCR images from 'google-samples' project; allow switch on whether dns service is 
supported, or to use env vars to get service host info.

Test change to reflect php filename change.
 2015-09-03 19:14:24 -07:00
Dr. Stefan Schimanski 227f8de5a4 Switch to gcr.io Docker registry 2015-08-17 09:43:52 +02:00
Dr. Stefan Schimanski 043df0e057 Convert guestbook example to relative urls 2015-08-17 09:43:51 +02:00
Brendan Burns 79fb674679 Fix the service printer to be a single line per service 2015-08-10 10:57:45 -07:00
Eric Paris 4cbca2e63c Make munger begin/end less generic 
Just force the beginMungeTag() endMungeTag() macros on users, by hiding
it under the covers. It really simplies things for users.
 2015-07-30 20:41:30 -04:00
Janet Kuo 180798cfa4 Use example syncer tags instead of hard-coded examples in doc 2015-07-27 14:48:41 -07:00
Vish Kannan 1a908a272e Merge pull request #11076 from nikhiljindal/apiError 
Updating apiserver to not return 500 when a service without pods is proxied
 2015-07-23 18:03:07 -07:00
Satnam Singh 1a0d309a3c Convert shell to console outpout for Guestbook example documentation 2015-07-18 23:03:55 +01:00
Tim Hockin 33f1862830 Run gendocs 2015-07-17 15:35:43 -07:00
Daniel Smith f7873d2a1f apply changes 2015-07-17 11:04:46 -07:00
Tim Hockin 542e13d2d3 Better scary message 2015-07-17 09:28:49 -07:00
Brian Grant 786b59427d Merge pull request #11400 from lavalamp/munger 
Add absolute path link checking to munger
 2015-07-16 22:50:14 -07:00
Daniel Smith 98eeadb66e (mostly) auto fixed links 2015-07-16 16:28:18 -07:00
Tim Hockin f7512d007b Add munger to verify kubectl -f targets, fix docs 2015-07-16 15:39:45 -07:00
nikhiljindal 1517b66001 Updating an error to apierror 2015-07-15 16:43:59 -07:00
Tim Hockin 39b86908a1 Run gendocs 2015-07-14 17:28:47 -07:00
Tim Hockin 79f9cd7c83 Run gendocs 2015-07-14 15:28:59 -07:00
Mike Danese 3eff8fce41 automated link fixes 2015-07-14 10:51:10 -07:00
Daniel Smith 821e08fded Apply mungedocs changes 2015-07-13 17:48:40 -07:00
Chao Xu 336c17b87b replace REASON column with STATUS in kubectl output in examples/ 2015-07-07 13:46:50 -07:00
RichieEscarez 899145da10 Replaced (or defined first instance of) GKE/GCE with Google Container Engine/Google Compute Engine 
Fixes #10354
 2015-06-26 13:30:41 -07:00
Amy Unruh 22f1b07858 Improvements to the guestbook example README that also address a number of open issues; switch to .yaml config files. 2015-06-22 08:48:49 -07:00
goltermann 2ee8d8e009 Update cleanup step to use kubectl labels. 2015-06-11 13:29:00 -07:00
Chao Xu 39382b2da5 Upgrade examples/guestbook to v1 2015-06-10 11:16:01 -07:00
krousey fac22fc16c Merge pull request #9436 from timstclair/guestbook-docs 
Clean up guestbook README.md
 2015-06-09 14:59:48 -07:00
Brendan Burns 9e198a6ed9 Purge cluster/kubectl.sh from nearly all docs. 
Mark cluster/kubectl.sh as deprecated.
 2015-06-09 13:35:52 -07:00
Tim St. Clair ee72bc8f5a Remove out of date note from guestbook example 2015-06-08 15:33:29 -07:00