diff --git a/ceph/values.yaml b/ceph/values.yaml index 22177813af..df7c7d80aa 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -25,11 +25,11 @@ images: tags: ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_cephfs_provisioner: 'quay.io/external_storage/cephfs-provisioner:v0.1.1' - ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.9.6' + ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.0' ceph_mds: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_mgr: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_mon: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' - ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.9.6' + ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.0' ceph_osd: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_rbd_pool: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v0.1.1' diff --git a/tools/images/ceph-config-helper/Dockerfile b/tools/images/ceph-config-helper/Dockerfile index 1f12c61ad3..92b1f7b57b 100644 --- a/tools/images/ceph-config-helper/Dockerfile +++ b/tools/images/ceph-config-helper/Dockerfile @@ -1,7 +1,7 @@ FROM docker.io/ubuntu:xenial MAINTAINER pete.birley@att.com -ARG KUBE_VERSION=v1.9.6 +ARG KUBE_VERSION=v1.10.0 ARG CEPH_RELEASE=luminous ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc @@ -17,6 +17,7 @@ RUN set -ex ;\ apt-get install -y \ apt-transport-https \ ca-certificates \ + ceph \ curl \ python \ jq ;\ diff --git a/tools/images/ceph-config-helper/Makefile b/tools/images/ceph-config-helper/Makefile index ac72363634..9bb35486c4 100644 --- a/tools/images/ceph-config-helper/Makefile +++ b/tools/images/ceph-config-helper/Makefile @@ -19,7 +19,7 @@ DOCKER_REGISTRY ?= docker.io IMAGE_NAME ?= ceph-config-helper IMAGE_PREFIX ?= openstackhelm IMAGE_TAG ?= latest -KUBE_VERSION ?= v1.9.6 +KUBE_VERSION ?= v1.10.0 LABEL ?= putlabelshere IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} diff --git a/tools/images/ceph-config-helper/README.rst b/tools/images/ceph-config-helper/README.rst index a1b68ed253..6ccf909f30 100644 --- a/tools/images/ceph-config-helper/README.rst +++ b/tools/images/ceph-config-helper/README.rst @@ -31,7 +31,7 @@ repo run: .. code:: bash - export KUBE_VERSION=v1.9.6 + export KUBE_VERSION=v1.10.0 sudo docker build \ --network host \ --build-arg KUBE_VERSION=${KUBE_VERSION} \