Skip to content
This repository was archived by the owner on Apr 19, 2021. It is now read-only.

Commit dec8a0b

Browse files
jmcarpjmcarp
committed
Log to the usual paths.
1 parent dd13ba2 commit dec8a0b

File tree

5 files changed

+60
-45
lines changed

5 files changed

+60
-45
lines changed

‎jobs/kubernetes-master/templates/apiserver_ctl.erb‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
CERT_DIR=/var/vcap/jobs/kubernetes-master/certs
44
RUN_DIR=/var/vcap/sys/run/apiserver
5+
LOG_DIR=/var/vcap/sys/log/apiserver
56
JOB_DIR=/var/vcap/jobs/apiserver
67

78
PIDFILE=$RUN_DIR/apiserver.pid
@@ -22,29 +23,31 @@ case $1 in
2223
pid_guard $PIDFILE "apiserver"
2324

2425
mkdir -p $RUN_DIR
26+
mkdir -p $LOG_DIR
2527

2628
echo $$ > $PIDFILE
2729

2830
exec /var/vcap/packages/kubernetes/bin/kube-apiserver \
29-
<% if_p('apiserver.event-ttl') do %>--event-ttl=<%= p('apiserver.event-ttl') %><% end %> \
30-
--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota \
31-
--allow-privileged=true \
32-
--anonymous-auth=false \
33-
--apiserver-count=<%= p('apiserver.hosts').length %> \
34-
--cert-dir=$CERT_DIR \
35-
--cloud-provider=<%= p('cloud-provider') %> \
36-
--etcd-servers=<%= p('etcd.machines').map { |h| "http://#{h}:4001" }.join ',' %> \
37-
--insecure-bind-address=0.0.0.0 \
38-
--insecure-port=8080 \
39-
--logtostderr=true \
40-
--service-account-key-file=${CERT_DIR}/kubernetes-key.pem \
41-
--service-cluster-ip-range="10.0.0.0/24" \
42-
--storage-backend=<%= p('apiserver.storage_backend') %> \
43-
--storage-media-type=<%= p('apiserver.storage_media_type') %> \
44-
--tls-cert-file=${CERT_DIR}/kubernetes.pem \
45-
--tls-private-key-file=${CERT_DIR}/kubernetes-key.pem \
46-
${BASIC_AUTH_FILE:-} \
47-
${TOKEN_AUTH_FILE:-}
31+
<% if_p('apiserver.event-ttl') do %>--event-ttl=<%= p('apiserver.event-ttl') %><% end %> \
32+
--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota \
33+
--allow-privileged=true \
34+
--anonymous-auth=false \
35+
--apiserver-count=<%= p('apiserver.hosts').length %> \
36+
--cert-dir=$CERT_DIR \
37+
--cloud-provider=<%= p('cloud-provider') %> \
38+
--etcd-servers=<%= p('etcd.machines').map { |h| "http://#{h}:4001" }.join ',' %> \
39+
--insecure-bind-address=0.0.0.0 \
40+
--insecure-port=8080 \
41+
--service-account-key-file=${CERT_DIR}/kubernetes-key.pem \
42+
--service-cluster-ip-range="10.0.0.0/24" \
43+
--storage-backend=<%= p('apiserver.storage_backend') %> \
44+
--storage-media-type=<%= p('apiserver.storage_media_type') %> \
45+
--tls-cert-file=${CERT_DIR}/kubernetes.pem \
46+
--tls-private-key-file=${CERT_DIR}/kubernetes-key.pem \
47+
${BASIC_AUTH_FILE:-} \
48+
${TOKEN_AUTH_FILE:-} \
49+
1>> $LOG_DIR/kube-apiserver.stdout.log \
50+
2>> $LOG_DIR/kube-apiserver.stderr.log
4851
;;
4952

5053
stop)

‎jobs/kubernetes-master/templates/controller-manager_ctl.erb‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
CERT_DIR=/var/vcap/jobs/kubernetes-master/certs
44
RUN_DIR=/var/vcap/sys/run/controller-manager
5+
LOG_DIR=/var/vcap/sys/log/controller-manager
56

67
PIDFILE=$RUN_DIR/controller-manager.pid
78

@@ -14,16 +15,18 @@ case $1 in
1415
pid_guard $PIDFILE "controller-manager"
1516

1617
mkdir -p $RUN_DIR
18+
mkdir -p $LOG_DIR
1719

1820
echo $$ > $PIDFILE
1921

2022
exec /var/vcap/packages/kubernetes/bin/kube-controller-manager \
21-
--master=127.0.0.1:8080 \
22-
--cloud-provider=<%= p('cloud-provider') %> \
23-
--leader-elect=true \
24-
--logtostderr=true \
25-
--root-ca-file=${CERT_DIR}/ca.pem \
26-
--service-account-private-key-file=${CERT_DIR}/kubernetes-key.pem
23+
--master=127.0.0.1:8080 \
24+
--cloud-provider=<%= p('cloud-provider') %> \
25+
--leader-elect=true \
26+
--root-ca-file=${CERT_DIR}/ca.pem \
27+
--service-account-private-key-file=${CERT_DIR}/kubernetes-key.pem \
28+
1>> $LOG_DIR/kube-controller-manager.stdout.log \
29+
2>> $LOG_DIR/kube-controller-manager.stderr.log
2730
;;
2831

2932
stop)

‎jobs/kubernetes-master/templates/scheduler_ctl.erb‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
RUN_DIR=/var/vcap/sys/run/scheduler
4+
LOG_DIR=/var/vcap/sys/log/scheduler
45
PIDFILE=$RUN_DIR/scheduler.pid
56
JOB_DIR=/var/vcap/jobs/scheduler
67

@@ -12,14 +13,16 @@ case $1 in
1213
pid_guard $PIDFILE "scheduler"
1314

1415
mkdir -p $RUN_DIR
16+
mkdir -p $LOG_DIR
1517

1618
echo $$ > $PIDFILE
1719

1820
exec /var/vcap/packages/kubernetes/bin/kube-scheduler \
19-
--address=0.0.0.0 \
20-
--master=127.0.0.1:8080 \
21-
--leader-elect=true \
22-
--logtostderr=true
21+
--address=0.0.0.0 \
22+
--master=127.0.0.1:8080 \
23+
--leader-elect=true \
24+
1>> $LOG_DIR/kube-scheduler.stdout.log \
25+
2>> $LOG_DIR/kube-scheduler.stderr.log
2326
;;
2427

2528
stop)

‎jobs/kubernetes-minion/templates/kubelet_ctl.erb‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
ROOT_DIR=/var/vcap/data/kubelet
44
RUN_DIR=/var/vcap/sys/run/kubelet
5+
LOG_DIR=/var/vcap/sys/log/kubelet
56
MANIFEST_DIR=${RUN_DIR}/manifests
67
CERT_DIR=${RUN_DIR}/certs
78
DOCKER_BOSH_RELEASE_PID=/var/vcap/sys/run/docker/docker.pid
@@ -20,6 +21,7 @@ case $1 in
2021
mkdir -p $ROOT_DIR
2122
mkdir -p $MANIFEST_DIR
2223
mkdir -p $CERT_DIR
24+
mkdir -p $LOG_DIR
2325

2426
if [ -f "${DOCKER_BOSH_RELEASE_PID}" ]; then
2527
ln -sf ${DOCKER_BOSH_RELEASE_PID} ${KUBERNETES_DOCKER_PID}
@@ -38,20 +40,21 @@ case $1 in
3840

3941
<% addr = spec.networks.to_h.values.first.ip %>
4042
exec /var/vcap/packages/kubernetes/bin/kubelet \
41-
--address=<%= addr %> \
42-
--allow-privileged=true \
43-
--port=10250 \
44-
--hostname_override=<%= addr %> \
45-
--api-servers=<%= p('apiserver.hosts').map { |h| "http://#{h}:8080" }.join ',' %> \
46-
--cert-dir=$CERT_DIR \
47-
--logtostderr=true \
48-
--docker-endpoint=unix:///var/vcap/sys/run/docker/docker.sock \
49-
--root-dir=$ROOT_DIR \
50-
--pod-manifest-path=${MANIFEST_DIR} \
51-
--cloud-provider=<%= p('cloud-provider') %> \
52-
--cluster_dns=10.0.0.10 \
53-
--cluster_domain=cluster.local \
54-
<% if_p('schedulable') do |schedulable| %>--register-schedulable=<%= schedulable.to_s %><% end %>
43+
--address=<%= addr %> \
44+
--allow-privileged=true \
45+
--port=10250 \
46+
--hostname_override=<%= addr %> \
47+
--api-servers=<%= p('apiserver.hosts').map { |h| "http://#{h}:8080" }.join ',' %> \
48+
--cert-dir=$CERT_DIR \
49+
--docker-endpoint=unix:///var/vcap/sys/run/docker/docker.sock \
50+
--root-dir=$ROOT_DIR \
51+
--pod-manifest-path=${MANIFEST_DIR} \
52+
--cloud-provider=<%= p('cloud-provider') %> \
53+
--cluster_dns=10.0.0.10 \
54+
--cluster_domain=cluster.local \
55+
<% if_p('schedulable') do |schedulable| %>--register-schedulable=<%= schedulable.to_s %><% end %> \
56+
1>> $LOG_DIR/kubelet.stdout.log \
57+
2>> $LOG_DIR/kubelet.stderr.log
5558
;;
5659

5760
stop)

‎jobs/kubernetes-minion/templates/proxy_ctl.erb‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
RUN_DIR=/var/vcap/sys/run/proxy
4+
LOG_DIR=/var/vcap/sys/log/proxy
45
PIDFILE=$RUN_DIR/proxy.pid
56
JOB_DIR=/var/vcap/jobs/proxy
67

@@ -12,12 +13,14 @@ case $1 in
1213
pid_guard $PIDFILE "proxy"
1314

1415
mkdir -p $RUN_DIR
16+
mkdir -p $LOG_DIR
1517

1618
echo $$ > $PIDFILE
1719

1820
exec /var/vcap/packages/kubernetes/bin/kube-proxy \
19-
--master=<%= p('apiserver.hosts')[0] %>:8080 \
20-
--logtostderr=true
21+
--master=<%= p('apiserver.hosts')[0] %>:8080 \
22+
1>> $LOG_DIR/kube-proxy.stdout.log \
23+
2>> $LOG_DIR/kube-proxy.stderr.log
2124
;;
2225

2326
stop)

0 commit comments

Comments
 (0)