diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index 7de69337fd..668d8ae8ce 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -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 | +-------------+-----------+ diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index 76164fac77..191156fabd 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -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 diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index acc19392c3..c9d2ea7a12 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -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 \ diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index a86cb37dfa..7805d3e255 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -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 diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml index 1e938cf1a1..1ccfd2193c 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml @@ -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