Use atomic containers for kubelet & apiserver
Use system containers based on fedora rawhide from projectatomic [1]. Until the fedoraproject updated the tags properly we mirror our containers in [2]. System containers are meant to be drop in replacements of the fedora kubernetes binaries. Update k8s to 1.7.4 to match the version in the containers. [1] https://github.com/projectatomic/atomic-system-containers [2] https://hub.docker.com/r/openstackmagnum/ Implements: blueprint run-kube-as-container Change-Id: I22918c0b06ca34d96ee68ac43fabcd5c0b281950
This commit is contained in:
parent
2f55af47ea
commit
024f2c0241
|
@ -2494,7 +2494,7 @@ The image currently has the following OS/software:
|
|||
+-------------+-----------+
|
||||
| Docker | 1.13.1 |
|
||||
+-------------+-----------+
|
||||
| Kubernetes | 1.6.7 |
|
||||
| Kubernetes | 1.7.4 |
|
||||
+-------------+-----------+
|
||||
| etcd | 3.1.3 |
|
||||
+-------------+-----------+
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
|
||||
echo "configuring kubernetes (master)"
|
||||
|
||||
atomic install --storage ostree --system --system-package=no --name=kubelet docker.io/openstackmagnum/kubernetes-kubelet:${KUBE_VERSION}
|
||||
atomic install --storage ostree --system --system-package=no --name=kube-apiserver docker.io/openstackmagnum/kubernetes-apiserver:${KUBE_VERSION}
|
||||
|
||||
sed -i '
|
||||
/^KUBE_ALLOW_PRIV=/ s/=.*/="--allow-privileged='"$KUBE_ALLOW_PRIV"'"/
|
||||
' /etc/kubernetes/config
|
||||
|
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
echo "configuring kubernetes (minion)"
|
||||
|
||||
atomic install --storage ostree --system --system-package=no --name=kubelet docker.io/openstackmagnum/kubernetes-kubelet:${KUBE_VERSION}
|
||||
|
||||
CERT_DIR=/etc/kubernetes/certs
|
||||
PROTOCOL=https
|
||||
FLANNEL_OPTIONS="-etcd-cafile $CERT_DIR/ca.crt \
|
||||
|
|
|
@ -316,7 +316,7 @@ parameters:
|
|||
kube_version:
|
||||
type: string
|
||||
description: version of kubernetes used for kubernetes cluster
|
||||
default: v1.6.7
|
||||
default: v1.7.4
|
||||
|
||||
kube_dashboard_version:
|
||||
type: string
|
||||
|
|
|
@ -319,7 +319,7 @@ parameters:
|
|||
kube_version:
|
||||
type: string
|
||||
description: version of kubernetes used for kubernetes cluster
|
||||
default: v1.5.3
|
||||
default: v1.7.4
|
||||
|
||||
kube_dashboard_version:
|
||||
type: string
|
||||
|
|
Loading…
Reference in New Issue