From bec2185854406ff75fbb983825264d537dfc12c6 Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Wed, 9 Aug 2023 12:54:54 -0500 Subject: [PATCH] feat: Bump rook-ceph to v1.12.1 (#1449) * chore: Update rook-ceph 1.11.9 => 1.12.0 * chore: Move rook-ceph/1.11.9 => 1.12.0 * chore: Update rook-ceph-cluster 1.11.9 => 1.12.0 * chore: Move rook-ceph-cluster/1.11.9 => 1.12.0 * fix(ceph): Bump missing versions * feat(ceph): Bump ceph apps to 1.12.1 * feat(licenses): Bump ceph image --------- Co-authored-by: d2iq-mergebot Co-authored-by: Grace Do --- licenses.d2iq.yaml | 2 +- .../rook-ceph-cluster/{1.11.9 => 1.12.1}/defaults/cm.yaml | 2 +- .../{1.11.9 => 1.12.1}/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.11.9 => 1.12.1}/helmrelease/dashboard-cm.yaml | 0 .../{1.11.9 => 1.12.1}/helmrelease/helmrelease.yaml | 4 ++-- .../{1.11.9 => 1.12.1}/helmrelease/kustomization.yaml | 0 .../rook-ceph-cluster/{1.11.9 => 1.12.1}/kustomization.yaml | 0 .../{1.11.9 => 1.12.1}/object-bucket-claims.yaml | 2 +- .../{1.11.9 => 1.12.1}/objectbucketclaims/helmrelease.yaml | 2 +- .../objectbucketclaims/kustomization.yaml | 0 .../rook-ceph-cluster/{1.11.9 => 1.12.1}/pre-install.yaml | 6 +++--- .../{1.11.9 => 1.12.1}/pre-install/ceph-crd-check.yaml | 0 .../{1.11.9 => 1.12.1}/rook-ceph-cluster.yaml | 4 ++-- services/rook-ceph/{1.11.9 => 1.12.1}/defaults/cm.yaml | 2 +- .../{1.11.9 => 1.12.1}/defaults/kustomization.yaml | 0 .../{1.11.9 => 1.12.1}/helmrelease/helmrelease.yaml | 4 ++-- .../{1.11.9 => 1.12.1}/helmrelease/kustomization.yaml | 0 services/rook-ceph/{1.11.9 => 1.12.1}/kustomization.yaml | 0 services/rook-ceph/{1.11.9 => 1.12.1}/rook-ceph.yaml | 2 +- 23 files changed, 15 insertions(+), 15 deletions(-) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/defaults/cm.yaml (99%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/defaults/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/grafana-dashboards/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/grafana-dashboards/rook-ceph-cluster.json (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/grafana-dashboards/rook-ceph-osd.json (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/grafana-dashboards/rook-ceph-pools.json (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/helmrelease/dashboard-cm.yaml (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/helmrelease/helmrelease.yaml (89%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/object-bucket-claims.yaml (90%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/objectbucketclaims/helmrelease.yaml (94%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/objectbucketclaims/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/pre-install.yaml (75%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/pre-install/ceph-crd-check.yaml (100%) rename services/rook-ceph-cluster/{1.11.9 => 1.12.1}/rook-ceph-cluster.yaml (86%) rename services/rook-ceph/{1.11.9 => 1.12.1}/defaults/cm.yaml (97%) rename services/rook-ceph/{1.11.9 => 1.12.1}/defaults/kustomization.yaml (100%) rename services/rook-ceph/{1.11.9 => 1.12.1}/helmrelease/helmrelease.yaml (89%) rename services/rook-ceph/{1.11.9 => 1.12.1}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph/{1.11.9 => 1.12.1}/kustomization.yaml (100%) rename services/rook-ceph/{1.11.9 => 1.12.1}/rook-ceph.yaml (90%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 52db1723b..5b2e06c14 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -307,7 +307,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/open-policy-agent/gatekeeper - - container_image: docker.io/rook/ceph:v1.11.9 + - container_image: docker.io/rook/ceph:v1.12.1 sources: - license_path: LICENSE ref: ${image_tag} diff --git a/services/rook-ceph-cluster/1.11.9/defaults/cm.yaml b/services/rook-ceph-cluster/1.12.1/defaults/cm.yaml similarity index 99% rename from services/rook-ceph-cluster/1.11.9/defaults/cm.yaml rename to services/rook-ceph-cluster/1.12.1/defaults/cm.yaml index 0aee7607b..592ab47cc 100644 --- a/services/rook-ceph-cluster/1.11.9/defaults/cm.yaml +++ b/services/rook-ceph-cluster/1.12.1/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: rook-ceph-cluster-1.11.9-d2iq-defaults + name: rook-ceph-cluster-1.12.1-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/rook-ceph-cluster/1.11.9/defaults/kustomization.yaml b/services/rook-ceph-cluster/1.12.1/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.11.9/defaults/kustomization.yaml rename to services/rook-ceph-cluster/1.12.1/defaults/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.11.9/grafana-dashboards/kustomization.yaml b/services/rook-ceph-cluster/1.12.1/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.11.9/grafana-dashboards/kustomization.yaml rename to services/rook-ceph-cluster/1.12.1/grafana-dashboards/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.11.9/grafana-dashboards/rook-ceph-cluster.json b/services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-cluster.json similarity index 100% rename from services/rook-ceph-cluster/1.11.9/grafana-dashboards/rook-ceph-cluster.json rename to services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-cluster.json diff --git a/services/rook-ceph-cluster/1.11.9/grafana-dashboards/rook-ceph-osd.json b/services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-osd.json similarity index 100% rename from services/rook-ceph-cluster/1.11.9/grafana-dashboards/rook-ceph-osd.json rename to services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-osd.json diff --git a/services/rook-ceph-cluster/1.11.9/grafana-dashboards/rook-ceph-pools.json b/services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-pools.json similarity index 100% rename from services/rook-ceph-cluster/1.11.9/grafana-dashboards/rook-ceph-pools.json rename to services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-pools.json diff --git a/services/rook-ceph-cluster/1.11.9/helmrelease/dashboard-cm.yaml b/services/rook-ceph-cluster/1.12.1/helmrelease/dashboard-cm.yaml similarity index 100% rename from services/rook-ceph-cluster/1.11.9/helmrelease/dashboard-cm.yaml rename to services/rook-ceph-cluster/1.12.1/helmrelease/dashboard-cm.yaml diff --git a/services/rook-ceph-cluster/1.11.9/helmrelease/helmrelease.yaml b/services/rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml similarity index 89% rename from services/rook-ceph-cluster/1.11.9/helmrelease/helmrelease.yaml rename to services/rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml index 229a086ae..31119c244 100644 --- a/services/rook-ceph-cluster/1.11.9/helmrelease/helmrelease.yaml +++ b/services/rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: charts.rook.io-release namespace: kommander-flux - version: v1.11.9 + version: v1.12.1 timeout: 15m interval: 15s install: @@ -26,5 +26,5 @@ spec: releaseName: rook-ceph-cluster valuesFrom: - kind: ConfigMap - name: rook-ceph-cluster-1.11.9-d2iq-defaults + name: rook-ceph-cluster-1.12.1-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph-cluster/1.11.9/helmrelease/kustomization.yaml b/services/rook-ceph-cluster/1.12.1/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.11.9/helmrelease/kustomization.yaml rename to services/rook-ceph-cluster/1.12.1/helmrelease/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.11.9/kustomization.yaml b/services/rook-ceph-cluster/1.12.1/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.11.9/kustomization.yaml rename to services/rook-ceph-cluster/1.12.1/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.11.9/object-bucket-claims.yaml b/services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml similarity index 90% rename from services/rook-ceph-cluster/1.11.9/object-bucket-claims.yaml rename to services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml index 2a99d3767..8d50d256a 100644 --- a/services/rook-ceph-cluster/1.11.9/object-bucket-claims.yaml +++ b/services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml @@ -13,7 +13,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.11.9/objectbucketclaims + path: ./services/rook-ceph-cluster/1.12.1/objectbucketclaims sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph-cluster/1.11.9/objectbucketclaims/helmrelease.yaml b/services/rook-ceph-cluster/1.12.1/objectbucketclaims/helmrelease.yaml similarity index 94% rename from services/rook-ceph-cluster/1.11.9/objectbucketclaims/helmrelease.yaml rename to services/rook-ceph-cluster/1.12.1/objectbucketclaims/helmrelease.yaml index 56f74c115..9008a3e43 100644 --- a/services/rook-ceph-cluster/1.11.9/objectbucketclaims/helmrelease.yaml +++ b/services/rook-ceph-cluster/1.12.1/objectbucketclaims/helmrelease.yaml @@ -26,7 +26,7 @@ spec: releaseName: object-bucket-claims valuesFrom: - kind: ConfigMap - name: rook-ceph-cluster-1.11.9-d2iq-defaults + name: rook-ceph-cluster-1.12.1-d2iq-defaults - kind: ConfigMap name: rook-ceph-cluster-overrides optional: true diff --git a/services/rook-ceph-cluster/1.11.9/objectbucketclaims/kustomization.yaml b/services/rook-ceph-cluster/1.12.1/objectbucketclaims/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.11.9/objectbucketclaims/kustomization.yaml rename to services/rook-ceph-cluster/1.12.1/objectbucketclaims/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.11.9/pre-install.yaml b/services/rook-ceph-cluster/1.12.1/pre-install.yaml similarity index 75% rename from services/rook-ceph-cluster/1.11.9/pre-install.yaml rename to services/rook-ceph-cluster/1.12.1/pre-install.yaml index 87ad73caa..f3616d3c9 100644 --- a/services/rook-ceph-cluster/1.11.9/pre-install.yaml +++ b/services/rook-ceph-cluster/1.12.1/pre-install.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 kind: Kustomization metadata: - name: rook-ceph-cluster-prereq-jobs-v1.11.9 + name: rook-ceph-cluster-prereq-jobs-v1.12.1 namespace: ${releaseNamespace} spec: force: true @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.11.9/pre-install + path: ./services/rook-ceph-cluster/1.12.1/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.11.9 + desiredCephOperatorVersion: v1.12.1 diff --git a/services/rook-ceph-cluster/1.11.9/pre-install/ceph-crd-check.yaml b/services/rook-ceph-cluster/1.12.1/pre-install/ceph-crd-check.yaml similarity index 100% rename from services/rook-ceph-cluster/1.11.9/pre-install/ceph-crd-check.yaml rename to services/rook-ceph-cluster/1.12.1/pre-install/ceph-crd-check.yaml diff --git a/services/rook-ceph-cluster/1.11.9/rook-ceph-cluster.yaml b/services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml similarity index 86% rename from services/rook-ceph-cluster/1.11.9/rook-ceph-cluster.yaml rename to services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml index 42f2e7e4b..383cabd9a 100644 --- a/services/rook-ceph-cluster/1.11.9/rook-ceph-cluster.yaml +++ b/services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml @@ -6,14 +6,14 @@ metadata: spec: dependsOn: # There can only be one operator per cluster, just ensure CRDs are present, no need to wait for actual operator Deployment. - - name: rook-ceph-cluster-prereq-jobs-v1.11.9 + - name: rook-ceph-cluster-prereq-jobs-v1.12.1 namespace: ${workspaceNamespace} force: false prune: true wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.11.9/helmrelease + path: ./services/rook-ceph-cluster/1.12.1/helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph/1.11.9/defaults/cm.yaml b/services/rook-ceph/1.12.1/defaults/cm.yaml similarity index 97% rename from services/rook-ceph/1.11.9/defaults/cm.yaml rename to services/rook-ceph/1.12.1/defaults/cm.yaml index 4c5c5d340..6d6adcab5 100644 --- a/services/rook-ceph/1.11.9/defaults/cm.yaml +++ b/services/rook-ceph/1.12.1/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: rook-ceph-1.11.9-d2iq-defaults + name: rook-ceph-1.12.1-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/rook-ceph/1.11.9/defaults/kustomization.yaml b/services/rook-ceph/1.12.1/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.11.9/defaults/kustomization.yaml rename to services/rook-ceph/1.12.1/defaults/kustomization.yaml diff --git a/services/rook-ceph/1.11.9/helmrelease/helmrelease.yaml b/services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml similarity index 89% rename from services/rook-ceph/1.11.9/helmrelease/helmrelease.yaml rename to services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml index cf44172e2..d84cf258b 100644 --- a/services/rook-ceph/1.11.9/helmrelease/helmrelease.yaml +++ b/services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: charts.rook.io-release namespace: kommander-flux - version: v1.11.9 + version: v1.12.1 interval: 15s install: crds: CreateReplace @@ -25,5 +25,5 @@ spec: releaseName: rook-ceph valuesFrom: - kind: ConfigMap - name: rook-ceph-1.11.9-d2iq-defaults + name: rook-ceph-1.12.1-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph/1.11.9/helmrelease/kustomization.yaml b/services/rook-ceph/1.12.1/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.11.9/helmrelease/kustomization.yaml rename to services/rook-ceph/1.12.1/helmrelease/kustomization.yaml diff --git a/services/rook-ceph/1.11.9/kustomization.yaml b/services/rook-ceph/1.12.1/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.11.9/kustomization.yaml rename to services/rook-ceph/1.12.1/kustomization.yaml diff --git a/services/rook-ceph/1.11.9/rook-ceph.yaml b/services/rook-ceph/1.12.1/rook-ceph.yaml similarity index 90% rename from services/rook-ceph/1.11.9/rook-ceph.yaml rename to services/rook-ceph/1.12.1/rook-ceph.yaml index 509d3b485..dde4ba7b3 100644 --- a/services/rook-ceph/1.11.9/rook-ceph.yaml +++ b/services/rook-ceph/1.12.1/rook-ceph.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph/1.11.9/helmrelease + path: ./services/rook-ceph/1.12.1/helmrelease sourceRef: kind: GitRepository name: management