x/k8s-docker-suite-app-murano
Code Issues Proposed changes

[docker] Switch kubernetes application to hyperkube

Browse Source 
Init scripts updated to use all-in-one-binary for all services

Change-Id: I96518d4c93a64d83a55c542e40d8024781fd95c8
This commit is contained in:
asilenkov 2016-07-26 18:06:35 +03:00
parent 001f04c3a2
commit 153df74882
20 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-apiserver
View File

@ -1,7 +1,7 @@
#Kube-Apiserver Upstart and SysVinit configuration file #Kube-Apiserver Upstart and SysVinit configuration file
# Customize kube-apiserver binary location # Customize kube-apiserver binary location
# KUBE_APISERVER="/opt/bin/kube-apiserver" KUBE_APISERVER="/opt/bin/hyperkube apiserver"
# Use KUBE_APISERVER_OPTS to modify the start/restart options # Use KUBE_APISERVER_OPTS to modify the start/restart options
KUBE_APISERVER_OPTS="--address=0.0.0.0 \ KUBE_APISERVER_OPTS="--address=0.0.0.0 \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-controller-manager
View File

@ -1,7 +1,7 @@
# Kube-Controller-Manager Upstart and SysVinit configuration file # Kube-Controller-Manager Upstart and SysVinit configuration file
# Customize kube-controller-manager binary location # Customize kube-controller-manager binary location
# KUBE_CONTROLLER_MANAGER="/opt/bin/kube-controller-manager" KUBE_CONTROLLER_MANAGER="/opt/bin/hyperkube controller-manager"
# Use KUBE_CONTROLLER_MANAGER_OPTS to modify the start/restart options # Use KUBE_CONTROLLER_MANAGER_OPTS to modify the start/restart options
KUBE_CONTROLLER_MANAGER_OPTS="--master=127.0.0.1:8080 \ KUBE_CONTROLLER_MANAGER_OPTS="--master=127.0.0.1:8080 \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-proxy
View File

@ -1,7 +1,7 @@
# Kube-Proxy Upstart and SysVinit configuration file # Kube-Proxy Upstart and SysVinit configuration file
# Customize kube-proxy binary location # Customize kube-proxy binary location
# KUBE_PROXY="/opt/bin/kube-proxy" KUBE_PROXY="/opt/bin/hyperkube proxy"
# Use KUBE_PROXY_OPTS to modify the start/restart options # Use KUBE_PROXY_OPTS to modify the start/restart options
KUBE_PROXY_OPTS="--logtostderr=false --master=http://%%MASTER_IP%%:8080 --log_dir=/var/log/kubernetes" KUBE_PROXY_OPTS="--logtostderr=false --master=http://%%MASTER_IP%%:8080 --log_dir=/var/log/kubernetes"

2
Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kube-scheduler
View File

@ -1,7 +1,7 @@
# Kube-Scheduler Upstart and SysVinit configuration file # Kube-Scheduler Upstart and SysVinit configuration file
# Customize kube-apiserver binary location # Customize kube-apiserver binary location
# KUBE_SCHEDULER="/opt/bin/kube-apiserver" KUBE_SCHEDULER="/opt/bin/hyperkube scheduler"
# Use KUBE_SCHEDULER_OPTS to modify the start/restart options # Use KUBE_SCHEDULER_OPTS to modify the start/restart options
KUBE_SCHEDULER_OPTS="--logtostderr=false --log_dir=/var/log/kubernetes \ KUBE_SCHEDULER_OPTS="--logtostderr=false --log_dir=/var/log/kubernetes \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/default_scripts/kubelet
View File

@ -1,7 +1,7 @@
# Kubelet Upstart and SysVinit configuration file # Kubelet Upstart and SysVinit configuration file
# Customize kubelet binary location # Customize kubelet binary location
# KUBELET="/opt/bin/kubelet" KUBELET="/opt/bin/hyperkube kubelet"
# Use KUBELET_OPTS to modify the start/restart options # Use KUBELET_OPTS to modify the start/restart options
KUBELET_OPTS="--address=%%IP%% \ KUBELET_OPTS="--address=%%IP%% \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-apiserver.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script pre-start script
# see also https://github.com/jainvipin/kubernetes-start # see also https://github.com/jainvipin/kubernetes-start
KUBE_APISERVER=/opt/bin/$UPSTART_JOB KUBE_APISERVER=/opt/bin/hyperkube apiserver
if [ -f /etc/default/$UPSTART_JOB ]; then if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB . /etc/default/$UPSTART_JOB
fi fi

2
Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-controller-manager.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script pre-start script
# see also https://github.com/jainvipin/kubernetes-ubuntu-start # see also https://github.com/jainvipin/kubernetes-ubuntu-start
KUBE_CONTROLLER_MANAGER=/opt/bin/$UPSTART_JOB KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
if [ -f /etc/default/$UPSTART_JOB ]; then if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB . /etc/default/$UPSTART_JOB
fi fi

2
Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-proxy.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script pre-start script
# see also https://github.com/jainvipin/kubernetes-start # see also https://github.com/jainvipin/kubernetes-start
KUBE_PROXY=/opt/bin/$UPSTART_JOB KUBE_PROXY=/opt/bin/hyperkube proxy
if [ -f /etc/default/$UPSTART_JOB ]; then if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB . /etc/default/$UPSTART_JOB
fi fi

2
Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kube-scheduler.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script pre-start script
# see also https://github.com/jainvipin/kubernetes-start # see also https://github.com/jainvipin/kubernetes-start
KUBE_SCHEDULER=/opt/bin/$UPSTART_JOB KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
if [ -f /etc/default/$UPSTART_JOB ]; then if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB . /etc/default/$UPSTART_JOB
fi fi

2
Kubernetes/KubernetesCluster/package/Resources/scripts/init_conf/kubelet.conf
View File

@ -9,7 +9,7 @@ stop on stopping etcd
pre-start script pre-start script
# see also https://github.com/jainvipin/kubernetes-ubuntu-start # see also https://github.com/jainvipin/kubernetes-ubuntu-start
KUBELET=/opt/bin/$UPSTART_JOB KUBELET=/opt/bin/hyperkube kubelet
if [ -f /etc/default/$UPSTART_JOB ]; then if [ -f /etc/default/$UPSTART_JOB ]; then
. /etc/default/$UPSTART_JOB . /etc/default/$UPSTART_JOB
fi fi

2
Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-apiserver
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0) BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-apiserver) # modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
KUBE_APISERVER=/opt/bin/$BASE KUBE_APISERVER=/opt/bin/hyperkube apiserver
# This is the pid file managed by kube-apiserver itself # This is the pid file managed by kube-apiserver itself
KUBE_APISERVER_PIDFILE=/var/run/$BASE.pid KUBE_APISERVER_PIDFILE=/var/run/$BASE.pid
KUBE_APISERVER_LOGFILE=/var/log/$BASE.log KUBE_APISERVER_LOGFILE=/var/log/$BASE.log

2
Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-controller-manager
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0) BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-controller-manager) # modify these in /etc/default/$BASE (/etc/default/kube-controller-manager)
KUBE_CONTROLLER_MANAGER=/opt/bin/$BASE KUBE_CONTROLLER_MANAGER=/opt/bin/hyperkube controller-manager
# This is the pid file managed by kube-controller-manager itself # This is the pid file managed by kube-controller-manager itself
KUBE_CONTROLLER_MANAGER_PIDFILE=/var/run/$BASE.pid KUBE_CONTROLLER_MANAGER_PIDFILE=/var/run/$BASE.pid
KUBE_CONTROLLER_MANAGER_LOGFILE=/var/log/$BASE.log KUBE_CONTROLLER_MANAGER_LOGFILE=/var/log/$BASE.log

2
Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-proxy
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0) BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-proxy) # modify these in /etc/default/$BASE (/etc/default/kube-proxy)
KUBE_PROXY=/opt/bin/$BASE KUBE_PROXY=/opt/bin/hyperkube proxy
# This is the pid file managed by kube-proxy itself # This is the pid file managed by kube-proxy itself
KUBE_PROXY_PIDFILE=/var/run/$BASE.pid KUBE_PROXY_PIDFILE=/var/run/$BASE.pid
KUBE_PROXY_LOGFILE=/var/log/$BASE.log KUBE_PROXY_LOGFILE=/var/log/$BASE.log

2
Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kube-scheduler
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0) BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-scheduler) # modify these in /etc/default/$BASE (/etc/default/kube-scheduler)
KUBE_SCHEDULER=/opt/bin/$BASE KUBE_SCHEDULER=/opt/bin/hyperkube scheduler
# This is the pid file managed by kube-scheduler itself # This is the pid file managed by kube-scheduler itself
KUBE_SCHEDULER_PIDFILE=/var/run/$BASE.pid KUBE_SCHEDULER_PIDFILE=/var/run/$BASE.pid
KUBE_SCHEDULER_LOGFILE=/var/log/$BASE.log KUBE_SCHEDULER_LOGFILE=/var/log/$BASE.log

2
Kubernetes/KubernetesCluster/package/Resources/scripts/initd_scripts/kubelet
View File

@ -19,7 +19,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/opt/bi
BASE=$(basename $0) BASE=$(basename $0)
# modify these in /etc/default/$BASE (/etc/default/kube-apiserver) # modify these in /etc/default/$BASE (/etc/default/kube-apiserver)
KUBELET=/opt/bin/$BASE KUBELET=/opt/bin/hyperkube kubelet
# This is the pid file managed by kube-apiserver itself # This is the pid file managed by kube-apiserver itself
KUBELET_PIDFILE=/var/run/$BASE.pid KUBELET_PIDFILE=/var/run/$BASE.pid
KUBELET_LOGFILE=/var/log/$BASE.log KUBELET_LOGFILE=/var/log/$BASE.log

2
Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-apiserver.service
View File

@ -7,7 +7,7 @@ After=etcd.service
[Service] [Service]
EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/config
EnvironmentFile=-/etc/kubernetes/apiserver EnvironmentFile=-/etc/kubernetes/apiserver
ExecStart=/opt/bin/kube-apiserver \ ExecStart=/opt/bin/hyperkube apiserver \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \
$KUBE_LOG_LEVEL \ $KUBE_LOG_LEVEL \
$KUBE_ETCD_SERVERS \ $KUBE_ETCD_SERVERS \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-controller-manager.service
View File

@ -4,7 +4,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
[Service] [Service]
EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/config
ExecStart=/opt/bin/kube-controller-manager \ ExecStart=/opt/bin/hyperkube controller-manager \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \
$KUBE_LOG_LEVEL \ $KUBE_LOG_LEVEL \
$KUBE_MASTER \ $KUBE_MASTER \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-proxy.service
View File

@ -6,7 +6,7 @@ After=network.target
[Service] [Service]
EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/config
EnvironmentFile=-/etc/kubernetes/proxy EnvironmentFile=-/etc/kubernetes/proxy
ExecStart=/opt/bin/kube-proxy \ ExecStart=/opt/bin/hyperkube proxy \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \
$KUBE_LOG_LEVEL \ $KUBE_LOG_LEVEL \
$KUBE_MASTER \ $KUBE_MASTER \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kube-scheduler.service
View File

@ -4,7 +4,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
[Service] [Service]
EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/config
ExecStart=/opt/bin/kube-scheduler \ ExecStart=/opt/bin/hyperkube scheduler \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \
$KUBE_LOG_LEVEL \ $KUBE_LOG_LEVEL \
$KUBE_MASTER \ $KUBE_MASTER \

2
Kubernetes/KubernetesCluster/package/Resources/scripts/systemd/kubelet.service
View File

@ -7,7 +7,7 @@ Requires=docker.service
[Service] [Service]
EnvironmentFile=-/etc/kubernetes/config EnvironmentFile=-/etc/kubernetes/config
EnvironmentFile=-/etc/kubernetes/kubelet EnvironmentFile=-/etc/kubernetes/kubelet
ExecStart=/opt/bin/kubelet \ ExecStart=/opt/bin/hyperkube kubelet \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \
$KUBE_LOG_LEVEL \ $KUBE_LOG_LEVEL \
$KUBELET_API_SERVER \ $KUBELET_API_SERVER \