From 281b2018c273650b25a5d2ddda5c1e4451beb5a9 Mon Sep 17 00:00:00 2001 From: Chinasubbareddy Mallavarapu Date: Tue, 18 Feb 2020 14:04:29 -0600 Subject: [PATCH] CEPH: upgrade ceph version from 14.2.5 to 14.2.7 This is to upgrade ceph version from 14.2.5 from 14.2.7 and also to update ceph provisioners to use latest code from quay.io - rbd-provisioner: quay.io/external_storage/rbd-provisioner:v2.1.1-k8s1.11 - cephfs-provisioner: quay.io/external_storage/cephfs-provisioner:v2.1.0-k8s1.11 This also updates verbs for proivioner's clusterrole to support new code. Change-Id: Ia94129574610bb5c800a6941804e58ca3aefce65 --- ceph-client/values.yaml | 10 +++++----- ceph-mon/values.yaml | 8 ++++---- ceph-osd/values.yaml | 6 +++--- .../templates/deployment-cephfs-provisioner.yaml | 5 +++++ .../templates/deployment-rbd-provisioner.yaml | 5 +++++ ceph-provisioners/values.yaml | 8 ++++---- ceph-rgw/values.yaml | 8 ++++---- 7 files changed, 30 insertions(+), 20 deletions(-) diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index 3f929a719..0c87b72b7 100644 --- a/ceph-client/values.yaml +++ b/ceph-client/values.yaml @@ -25,11 +25,11 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' - ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' + ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/docker:17.07.0' local_registry: diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index 2ae6d8ed7..8440b308f 100644 --- a/ceph-mon/values.yaml +++ b/ceph-mon/values.yaml @@ -24,10 +24,10 @@ deployment: images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' - ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' + ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/docker:17.07.0' local_registry: diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml index 07f99402c..e477c27d2 100644 --- a/ceph-osd/values.yaml +++ b/ceph-osd/values.yaml @@ -20,9 +20,9 @@ images: pull_policy: IfNotPresent tags: - ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' + ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/docker:17.07.0' local_registry: diff --git a/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml b/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml index e9ce7d096..316f697cb 100644 --- a/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml +++ b/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml @@ -79,6 +79,11 @@ rules: - endpoints verbs: - get + - list + - watch + - create + - update + - patch - apiGroups: - extensions resources: diff --git a/ceph-provisioners/templates/deployment-rbd-provisioner.yaml b/ceph-provisioners/templates/deployment-rbd-provisioner.yaml index 997e38d92..df9dc30c4 100644 --- a/ceph-provisioners/templates/deployment-rbd-provisioner.yaml +++ b/ceph-provisioners/templates/deployment-rbd-provisioner.yaml @@ -69,6 +69,11 @@ rules: - endpoints verbs: - get + - list + - watch + - create + - update + - patch - apiGroups: - extensions resources: diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 75e6bffe1..c1cb1434c 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -28,10 +28,10 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_bionic-20191216' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' - ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_bionic-20191216' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_bionic-20200217' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' + ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_bionic-20200217' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/docker:17.07.0' local_registry: diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index 474a34fdd..b7426af81 100644 --- a/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml @@ -25,12 +25,12 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' - ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' + ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20200217' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/docker:17.07.0' - rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216' + rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20200217' ks_endpoints: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial' ks_service: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial' ks_user: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial'