From 559db59a7b9a3aa80c65e02af7e652d9d0e7c5be Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Wed, 5 Apr 2023 23:07:29 +0100 Subject: [PATCH] feat: Bump rook-ceph to 1.11.2 (#1115) * chore: Update rook-ceph 1.10.11 => 1.11.2 * chore: Move rook-ceph/1.10.11 => rook-ceph/1.11.2 * chore: Update rook-ceph-cluster 1.10.11 => 1.11.2 * chore: Move rook-ceph-cluster/1.10.11 => rook-ceph-cluster/1.11.2 * fix: Bump missing ceph version in pre-install * feat: Bump ceph in licenses * fix: Remove deprecated healthCheck spec * feat: Remove pspEnable as it is now defaulted to false --------- Co-authored-by: d2iq-mergebot Co-authored-by: Grace Do --- licenses.d2iq.yaml | 2 +- .../{1.10.11 => 1.11.2}/defaults/cm.yaml | 9 +-------- .../{1.10.11 => 1.11.2}/defaults/kustomization.yaml | 0 .../grafana-dashboards/kustomization.yaml | 0 .../grafana-dashboards/rook-ceph-cluster.json | 0 .../grafana-dashboards/rook-ceph-osd.json | 0 .../grafana-dashboards/rook-ceph-pools.json | 0 .../{1.10.11 => 1.11.2}/helmrelease/dashboard-cm.yaml | 0 .../{1.10.11 => 1.11.2}/helmrelease/helmrelease.yaml | 4 ++-- .../{1.10.11 => 1.11.2}/helmrelease/kustomization.yaml | 0 .../{1.10.11 => 1.11.2}/kustomization.yaml | 0 .../{1.10.11 => 1.11.2}/object-bucket-claims.yaml | 2 +- .../objectbucketclaims/helmrelease.yaml | 2 +- .../objectbucketclaims/kustomization.yaml | 0 .../{1.10.11 => 1.11.2}/pre-install.yaml | 4 ++-- .../{1.10.11 => 1.11.2}/pre-install/ceph-crd-check.yaml | 0 .../{1.10.11 => 1.11.2}/rook-ceph-cluster.yaml | 2 +- services/rook-ceph/{1.10.11 => 1.11.2}/defaults/cm.yaml | 5 +---- .../{1.10.11 => 1.11.2}/defaults/kustomization.yaml | 0 .../{1.10.11 => 1.11.2}/helmrelease/helmrelease.yaml | 4 ++-- .../{1.10.11 => 1.11.2}/helmrelease/kustomization.yaml | 0 .../rook-ceph/{1.10.11 => 1.11.2}/kustomization.yaml | 0 services/rook-ceph/{1.10.11 => 1.11.2}/rook-ceph.yaml | 2 +- 23 files changed, 13 insertions(+), 23 deletions(-) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/defaults/cm.yaml (97%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/defaults/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/grafana-dashboards/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/grafana-dashboards/rook-ceph-cluster.json (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/grafana-dashboards/rook-ceph-osd.json (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/grafana-dashboards/rook-ceph-pools.json (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/helmrelease/dashboard-cm.yaml (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/helmrelease/helmrelease.yaml (88%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/object-bucket-claims.yaml (89%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/objectbucketclaims/helmrelease.yaml (94%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/objectbucketclaims/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/pre-install.yaml (82%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/pre-install/ceph-crd-check.yaml (100%) rename services/rook-ceph-cluster/{1.10.11 => 1.11.2}/rook-ceph-cluster.yaml (92%) rename services/rook-ceph/{1.10.11 => 1.11.2}/defaults/cm.yaml (92%) rename services/rook-ceph/{1.10.11 => 1.11.2}/defaults/kustomization.yaml (100%) rename services/rook-ceph/{1.10.11 => 1.11.2}/helmrelease/helmrelease.yaml (89%) rename services/rook-ceph/{1.10.11 => 1.11.2}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph/{1.10.11 => 1.11.2}/kustomization.yaml (100%) rename services/rook-ceph/{1.10.11 => 1.11.2}/rook-ceph.yaml (90%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index ee5ae46dc..45dd76f6d 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -163,7 +163,7 @@ resources: ref: ${image_tag} license_path: LICENSE notice_path: NOTICE - - container_image: docker.io/rook/ceph:v1.10.11 + - container_image: docker.io/rook/ceph:v1.11.2 sources: - url: https://github.com/rook/rook ref: ${image_tag} diff --git a/services/rook-ceph-cluster/1.10.11/defaults/cm.yaml b/services/rook-ceph-cluster/1.11.2/defaults/cm.yaml similarity index 97% rename from services/rook-ceph-cluster/1.10.11/defaults/cm.yaml rename to services/rook-ceph-cluster/1.11.2/defaults/cm.yaml index 30171bbfe..0c21e4ba2 100644 --- a/services/rook-ceph-cluster/1.10.11/defaults/cm.yaml +++ b/services/rook-ceph-cluster/1.11.2/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: rook-ceph-cluster-1.10.11-d2iq-defaults + name: rook-ceph-cluster-1.11.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -14,10 +14,6 @@ data: # This is enabled by default to workaround D2IQ-96634 enabled: true - # PSP is Unsupported in 1.25+ k8s - # Set this to the same value as the rook-ceph chart. - pspEnable: false - # All values below are taken from the CephCluster CRD cephClusterSpec: labels: @@ -166,9 +162,6 @@ data: requests: cpu: "250m" memory: "500Mi" - healthCheck: - bucket: - interval: 60s storageClass: enabled: true name: dkp-object-store # Defined once per namespace diff --git a/services/rook-ceph-cluster/1.10.11/defaults/kustomization.yaml b/services/rook-ceph-cluster/1.11.2/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.10.11/defaults/kustomization.yaml rename to services/rook-ceph-cluster/1.11.2/defaults/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.10.11/grafana-dashboards/kustomization.yaml b/services/rook-ceph-cluster/1.11.2/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.10.11/grafana-dashboards/kustomization.yaml rename to services/rook-ceph-cluster/1.11.2/grafana-dashboards/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.10.11/grafana-dashboards/rook-ceph-cluster.json b/services/rook-ceph-cluster/1.11.2/grafana-dashboards/rook-ceph-cluster.json similarity index 100% rename from services/rook-ceph-cluster/1.10.11/grafana-dashboards/rook-ceph-cluster.json rename to services/rook-ceph-cluster/1.11.2/grafana-dashboards/rook-ceph-cluster.json diff --git a/services/rook-ceph-cluster/1.10.11/grafana-dashboards/rook-ceph-osd.json b/services/rook-ceph-cluster/1.11.2/grafana-dashboards/rook-ceph-osd.json similarity index 100% rename from services/rook-ceph-cluster/1.10.11/grafana-dashboards/rook-ceph-osd.json rename to services/rook-ceph-cluster/1.11.2/grafana-dashboards/rook-ceph-osd.json diff --git a/services/rook-ceph-cluster/1.10.11/grafana-dashboards/rook-ceph-pools.json b/services/rook-ceph-cluster/1.11.2/grafana-dashboards/rook-ceph-pools.json similarity index 100% rename from services/rook-ceph-cluster/1.10.11/grafana-dashboards/rook-ceph-pools.json rename to services/rook-ceph-cluster/1.11.2/grafana-dashboards/rook-ceph-pools.json diff --git a/services/rook-ceph-cluster/1.10.11/helmrelease/dashboard-cm.yaml b/services/rook-ceph-cluster/1.11.2/helmrelease/dashboard-cm.yaml similarity index 100% rename from services/rook-ceph-cluster/1.10.11/helmrelease/dashboard-cm.yaml rename to services/rook-ceph-cluster/1.11.2/helmrelease/dashboard-cm.yaml diff --git a/services/rook-ceph-cluster/1.10.11/helmrelease/helmrelease.yaml b/services/rook-ceph-cluster/1.11.2/helmrelease/helmrelease.yaml similarity index 88% rename from services/rook-ceph-cluster/1.10.11/helmrelease/helmrelease.yaml rename to services/rook-ceph-cluster/1.11.2/helmrelease/helmrelease.yaml index 772ea30d7..2f34946fd 100644 --- a/services/rook-ceph-cluster/1.10.11/helmrelease/helmrelease.yaml +++ b/services/rook-ceph-cluster/1.11.2/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: charts.rook.io-release namespace: kommander-flux - version: v1.10.11 + version: v1.11.2 interval: 15s install: crds: CreateReplace @@ -25,5 +25,5 @@ spec: releaseName: rook-ceph-cluster valuesFrom: - kind: ConfigMap - name: rook-ceph-cluster-1.10.11-d2iq-defaults + name: rook-ceph-cluster-1.11.2-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph-cluster/1.10.11/helmrelease/kustomization.yaml b/services/rook-ceph-cluster/1.11.2/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.10.11/helmrelease/kustomization.yaml rename to services/rook-ceph-cluster/1.11.2/helmrelease/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.10.11/kustomization.yaml b/services/rook-ceph-cluster/1.11.2/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.10.11/kustomization.yaml rename to services/rook-ceph-cluster/1.11.2/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.10.11/object-bucket-claims.yaml b/services/rook-ceph-cluster/1.11.2/object-bucket-claims.yaml similarity index 89% rename from services/rook-ceph-cluster/1.10.11/object-bucket-claims.yaml rename to services/rook-ceph-cluster/1.11.2/object-bucket-claims.yaml index 57fb69678..abcd91eab 100644 --- a/services/rook-ceph-cluster/1.10.11/object-bucket-claims.yaml +++ b/services/rook-ceph-cluster/1.11.2/object-bucket-claims.yaml @@ -13,7 +13,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.10.11/objectbucketclaims + path: ./services/rook-ceph-cluster/1.11.2/objectbucketclaims sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph-cluster/1.10.11/objectbucketclaims/helmrelease.yaml b/services/rook-ceph-cluster/1.11.2/objectbucketclaims/helmrelease.yaml similarity index 94% rename from services/rook-ceph-cluster/1.10.11/objectbucketclaims/helmrelease.yaml rename to services/rook-ceph-cluster/1.11.2/objectbucketclaims/helmrelease.yaml index 03f9c41d3..5836f591c 100644 --- a/services/rook-ceph-cluster/1.10.11/objectbucketclaims/helmrelease.yaml +++ b/services/rook-ceph-cluster/1.11.2/objectbucketclaims/helmrelease.yaml @@ -26,7 +26,7 @@ spec: releaseName: object-bucket-claims valuesFrom: - kind: ConfigMap - name: rook-ceph-cluster-1.10.11-d2iq-defaults + name: rook-ceph-cluster-1.11.2-d2iq-defaults - kind: ConfigMap name: rook-ceph-cluster-overrides optional: true diff --git a/services/rook-ceph-cluster/1.10.11/objectbucketclaims/kustomization.yaml b/services/rook-ceph-cluster/1.11.2/objectbucketclaims/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.10.11/objectbucketclaims/kustomization.yaml rename to services/rook-ceph-cluster/1.11.2/objectbucketclaims/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.10.11/pre-install.yaml b/services/rook-ceph-cluster/1.11.2/pre-install.yaml similarity index 82% rename from services/rook-ceph-cluster/1.10.11/pre-install.yaml rename to services/rook-ceph-cluster/1.11.2/pre-install.yaml index 5e08ff398..3acaf5857 100644 --- a/services/rook-ceph-cluster/1.10.11/pre-install.yaml +++ b/services/rook-ceph-cluster/1.11.2/pre-install.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.10.11/pre-install + path: ./services/rook-ceph-cluster/1.11.2/pre-install sourceRef: kind: GitRepository name: management @@ -19,4 +19,4 @@ spec: substitute: releaseNamespace: ${releaseNamespace} # Update the following version whenever ceph-cluster service is bumped. - desiredCephOperatorVersion: v1.10.11 + desiredCephOperatorVersion: v1.11.2 diff --git a/services/rook-ceph-cluster/1.10.11/pre-install/ceph-crd-check.yaml b/services/rook-ceph-cluster/1.11.2/pre-install/ceph-crd-check.yaml similarity index 100% rename from services/rook-ceph-cluster/1.10.11/pre-install/ceph-crd-check.yaml rename to services/rook-ceph-cluster/1.11.2/pre-install/ceph-crd-check.yaml diff --git a/services/rook-ceph-cluster/1.10.11/rook-ceph-cluster.yaml b/services/rook-ceph-cluster/1.11.2/rook-ceph-cluster.yaml similarity index 92% rename from services/rook-ceph-cluster/1.10.11/rook-ceph-cluster.yaml rename to services/rook-ceph-cluster/1.11.2/rook-ceph-cluster.yaml index fbf7672d2..e02c45df2 100644 --- a/services/rook-ceph-cluster/1.10.11/rook-ceph-cluster.yaml +++ b/services/rook-ceph-cluster/1.11.2/rook-ceph-cluster.yaml @@ -13,7 +13,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.10.11/helmrelease + path: ./services/rook-ceph-cluster/1.11.2/helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph/1.10.11/defaults/cm.yaml b/services/rook-ceph/1.11.2/defaults/cm.yaml similarity index 92% rename from services/rook-ceph/1.10.11/defaults/cm.yaml rename to services/rook-ceph/1.11.2/defaults/cm.yaml index 246e856a2..1f0c68aeb 100644 --- a/services/rook-ceph/1.10.11/defaults/cm.yaml +++ b/services/rook-ceph/1.11.2/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: rook-ceph-1.10.11-d2iq-defaults + name: rook-ceph-1.11.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -23,9 +23,6 @@ data: # Whether rook watches its current namespace for CRDs or the entire cluster, defaults to false currentNamespaceOnly: true - # PSP is Unsupported in 1.25+ k8s - pspEnable: false - logLevel: DEBUG csi: diff --git a/services/rook-ceph/1.10.11/defaults/kustomization.yaml b/services/rook-ceph/1.11.2/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.10.11/defaults/kustomization.yaml rename to services/rook-ceph/1.11.2/defaults/kustomization.yaml diff --git a/services/rook-ceph/1.10.11/helmrelease/helmrelease.yaml b/services/rook-ceph/1.11.2/helmrelease/helmrelease.yaml similarity index 89% rename from services/rook-ceph/1.10.11/helmrelease/helmrelease.yaml rename to services/rook-ceph/1.11.2/helmrelease/helmrelease.yaml index f1b602094..e7ae69c48 100644 --- a/services/rook-ceph/1.10.11/helmrelease/helmrelease.yaml +++ b/services/rook-ceph/1.11.2/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: charts.rook.io-release namespace: kommander-flux - version: v1.10.11 + version: v1.11.2 interval: 15s install: crds: CreateReplace @@ -25,5 +25,5 @@ spec: releaseName: rook-ceph valuesFrom: - kind: ConfigMap - name: rook-ceph-1.10.11-d2iq-defaults + name: rook-ceph-1.11.2-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph/1.10.11/helmrelease/kustomization.yaml b/services/rook-ceph/1.11.2/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.10.11/helmrelease/kustomization.yaml rename to services/rook-ceph/1.11.2/helmrelease/kustomization.yaml diff --git a/services/rook-ceph/1.10.11/kustomization.yaml b/services/rook-ceph/1.11.2/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.10.11/kustomization.yaml rename to services/rook-ceph/1.11.2/kustomization.yaml diff --git a/services/rook-ceph/1.10.11/rook-ceph.yaml b/services/rook-ceph/1.11.2/rook-ceph.yaml similarity index 90% rename from services/rook-ceph/1.10.11/rook-ceph.yaml rename to services/rook-ceph/1.11.2/rook-ceph.yaml index 698392f67..a110f158e 100644 --- a/services/rook-ceph/1.10.11/rook-ceph.yaml +++ b/services/rook-ceph/1.11.2/rook-ceph.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph/1.10.11/helmrelease + path: ./services/rook-ceph/1.11.2/helmrelease sourceRef: kind: GitRepository name: management