From 276374aacba96c8b7e6a6402484fd2a903c5b0c5 Mon Sep 17 00:00:00 2001 From: portdirect Date: Thu, 29 Mar 2018 15:35:03 -0400 Subject: [PATCH] Ceph: Update images and references This PS udpdates the Ceph charts images and references. Change-Id: I52b6577cdad58a21848f7eb31abb66ebdc47d81e --- ceph/templates/daemonset-mon.yaml | 4 +-- ceph/templates/daemonset-osd.yaml | 6 ++-- ceph/templates/deployment-mds.yaml | 4 +-- ceph/templates/deployment-mgr.yaml | 4 +-- ceph/templates/deployment-moncheck.yaml | 18 +----------- ceph/templates/deployment-rgw.yaml | 6 ++-- ceph/templates/job-rbd-pool.yaml | 2 +- ceph/values.yaml | 26 +++++++++++------- tools/images/ceph-config-helper/Dockerfile | 32 +++++++++++++--------- tools/images/ceph-config-helper/Makefile | 3 +- tools/images/ceph-config-helper/README.rst | 3 +- 11 files changed, 53 insertions(+), 55 deletions(-) diff --git a/ceph/templates/daemonset-mon.yaml b/ceph/templates/daemonset-mon.yaml index cff13e1638..022052d126 100644 --- a/ceph/templates/daemonset-mon.yaml +++ b/ceph/templates/daemonset-mon.yaml @@ -65,7 +65,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_mon }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init-dirs.sh @@ -85,7 +85,7 @@ spec: readOnly: false containers: - name: ceph-mon - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_mon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.mon | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/daemonset-osd.yaml b/ceph/templates/daemonset-osd.yaml index 94832f48ed..33e174adc5 100644 --- a/ceph/templates/daemonset-osd.yaml +++ b/ceph/templates/daemonset-osd.yaml @@ -42,7 +42,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_osd }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init-dirs.sh @@ -71,7 +71,7 @@ spec: mountPath: /run readOnly: false - name: osd-init - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_osd }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -126,7 +126,7 @@ spec: readOnly: false containers: - name: osd-pod - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_osd }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml index 832d9a05f1..5553f1262a 100644 --- a/ceph/templates/deployment-mds.yaml +++ b/ceph/templates/deployment-mds.yaml @@ -41,7 +41,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_mds }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init-dirs.sh @@ -61,7 +61,7 @@ spec: readOnly: false containers: - name: ceph-mds - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_mds }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.mds | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceph/templates/deployment-mgr.yaml b/ceph/templates/deployment-mgr.yaml index 8f52a7aa6f..d329ce8b49 100644 --- a/ceph/templates/deployment-mgr.yaml +++ b/ceph/templates/deployment-mgr.yaml @@ -44,7 +44,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_mgr }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init-dirs.sh @@ -66,7 +66,7 @@ spec: mountPath: /etc/ceph containers: - name: ceph-mgr - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_mgr }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/deployment-moncheck.yaml b/ceph/templates/deployment-moncheck.yaml index b27d601810..8c739608ff 100644 --- a/ceph/templates/deployment-moncheck.yaml +++ b/ceph/templates/deployment-moncheck.yaml @@ -39,25 +39,9 @@ spec: {{ .Values.labels.mon.node_selector_key }}: {{ .Values.labels.mon.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_daemon }} - imagePullPolicy: {{ .Values.images.pull_policy }} - command: - - /tmp/init-dirs.sh - env: - - name: CLUSTER - value: "ceph" - volumeMounts: - - name: ceph-bin - mountPath: /tmp/init-dirs.sh - subPath: init-dirs.sh - readOnly: true - - name: pod-var-lib-ceph - mountPath: /var/lib/ceph - readOnly: false containers: - name: ceph-mon - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_mon_check }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.moncheck | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml index 63de3475e6..db0f9926f3 100644 --- a/ceph/templates/deployment-rgw.yaml +++ b/ceph/templates/deployment-rgw.yaml @@ -40,7 +40,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_rgw }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init-dirs.sh @@ -60,7 +60,7 @@ spec: readOnly: false {{ if .Values.conf.rgw_ks.enabled }} - name: ceph-rgw-ks-init - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_rgw }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: @@ -94,7 +94,7 @@ spec: {{ end }} containers: - name: ceph-rgw - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_rgw }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/job-rbd-pool.yaml b/ceph/templates/job-rbd-pool.yaml index 342a17f188..c8205220ae 100644 --- a/ceph/templates/job-rbd-pool.yaml +++ b/ceph/templates/job-rbd-pool.yaml @@ -42,7 +42,7 @@ spec: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-rbd-pool - image: {{ .Values.images.tags.ceph_daemon }} + image: {{ .Values.images.tags.ceph_rbd_pool }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/values.yaml b/ceph/values.yaml index 7a65571532..611a5f50a6 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -21,17 +21,23 @@ deployment: rgw_keystone_user_and_endpoints: false images: + pull_policy: IfNotPresent tags: - ks_user: docker.io/openstackhelm/heat:newton - ks_service: docker.io/openstackhelm/heat:newton - ks_endpoints: docker.io/openstackhelm/heat:newton - ceph_bootstrap: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 - ceph_daemon: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 - ceph_config_helper: docker.io/port/ceph-config-helper:v1.7.5 - ceph_rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1 - ceph_cephfs_provisioner: quay.io/external_storage/cephfs-provisioner:v0.1.1 - pull_policy: "IfNotPresent" + 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_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_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' + ceph_rgw: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' + dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.0' + ks_endpoints: 'docker.io/openstackhelm/heat:newton' + ks_service: 'docker.io/openstackhelm/heat:newton' + ks_user: 'docker.io/openstackhelm/heat:newton' labels: job: diff --git a/tools/images/ceph-config-helper/Dockerfile b/tools/images/ceph-config-helper/Dockerfile index 5e6ce775ab..1f12c61ad3 100644 --- a/tools/images/ceph-config-helper/Dockerfile +++ b/tools/images/ceph-config-helper/Dockerfile @@ -1,20 +1,26 @@ -FROM ubuntu:16.04 +FROM docker.io/ubuntu:xenial MAINTAINER pete.birley@att.com -ARG KUBE_VERSION=v1.7.5 +ARG KUBE_VERSION=v1.9.6 +ARG CEPH_RELEASE=luminous -RUN set -x \ - && TMP_DIR=$(mktemp --directory) \ - && cd ${TMP_DIR} \ - && apt-get update \ - && apt-get install -y \ +ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc +RUN set -ex ;\ + export DEBIAN_FRONTEND=noninteractive ;\ + apt-key add /etc/apt/ceph-release.asc ;\ + rm -f /etc/apt/ceph-release.asc ;\ + echo deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list ;\ + TMP_DIR=$(mktemp --directory) ;\ + cd ${TMP_DIR} ;\ + apt-get update ;\ + apt-get dist-upgrade -y ;\ + apt-get install -y \ apt-transport-https \ ca-certificates \ curl \ python \ - jq \ -# Install kubectl: - && curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 \ - && mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl \ - && chmod +x /usr/bin/kubectl \ - && rm -rf ${TMP_DIR} + jq ;\ + curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\ + mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl ;\ + chmod +x /usr/bin/kubectl ;\ + rm -rf ${TMP_DIR} diff --git a/tools/images/ceph-config-helper/Makefile b/tools/images/ceph-config-helper/Makefile index 43cc2d7f68..ac72363634 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.7.5 +KUBE_VERSION ?= v1.9.6 LABEL ?= putlabelshere IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} @@ -32,6 +32,7 @@ images: build_$(IMAGE_NAME) .PHONY: build_$(IMAGE_NAME) build_$(IMAGE_NAME): docker build \ + --network host \ --build-arg KUBE_VERSION=$(KUBE_VERSION) \ -t $(IMAGE) \ --label $(LABEL) --label KUBE_VERSION=$(KUBE_VERSION) \ diff --git a/tools/images/ceph-config-helper/README.rst b/tools/images/ceph-config-helper/README.rst index 41e7897a2a..a1b68ed253 100644 --- a/tools/images/ceph-config-helper/README.rst +++ b/tools/images/ceph-config-helper/README.rst @@ -31,8 +31,9 @@ repo run: .. code:: bash - export KUBE_VERSION=v1.7.5 + export KUBE_VERSION=v1.9.6 sudo docker build \ + --network host \ --build-arg KUBE_VERSION=${KUBE_VERSION} \ -t docker.io/port/ceph-config-helper:${KUBE_VERSION} \ tools/images/ceph-config-helper