From a4b2461da0d1d6b9e7b4f962cf7d93a49e5135c2 Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Tue, 30 Apr 2024 04:29:52 +0200 Subject: [PATCH] feat: Bump rook-ceph-cluster to v1.14.2 (#2170) Co-authored-by: d2iq-mergebot Co-authored-by: Tarun Gupta Akirala --- licenses.d2iq.yaml | 4 ++-- services/dkp-insights/1.1.1/defaults/cm.yaml | 2 +- .../rook-ceph-cluster/{1.12.7 => 1.14.2}/defaults/cm.yaml | 4 ++-- .../{1.12.7 => 1.14.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.12.7 => 1.14.2}/helmrelease/dashboard-cm.yaml | 0 .../{1.12.7 => 1.14.2}/helmrelease/helmrelease.yaml | 4 ++-- .../{1.12.7 => 1.14.2}/helmrelease/kustomization.yaml | 0 .../rook-ceph-cluster/{1.12.7 => 1.14.2}/kustomization.yaml | 0 .../{1.12.7 => 1.14.2}/object-bucket-claims.yaml | 2 +- .../{1.12.7 => 1.14.2}/objectbucketclaims/helmrelease.yaml | 2 +- .../objectbucketclaims/kustomization.yaml | 0 .../rook-ceph-cluster/{1.12.7 => 1.14.2}/pre-install.yaml | 6 +++--- .../{1.12.7 => 1.14.2}/pre-install/ceph-crd-check.yaml | 0 .../{1.12.7 => 1.14.2}/rook-ceph-cluster.yaml | 4 ++-- services/rook-ceph/{1.12.7 => 1.14.2}/defaults/cm.yaml | 2 +- .../{1.12.7 => 1.14.2}/defaults/kustomization.yaml | 0 .../{1.12.7 => 1.14.2}/helmrelease/helmrelease.yaml | 4 ++-- .../{1.12.7 => 1.14.2}/helmrelease/kustomization.yaml | 0 services/rook-ceph/{1.12.7 => 1.14.2}/kustomization.yaml | 0 services/rook-ceph/{1.12.7 => 1.14.2}/rook-ceph.yaml | 2 +- 24 files changed, 18 insertions(+), 18 deletions(-) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/defaults/cm.yaml (99%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/defaults/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/grafana-dashboards/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/grafana-dashboards/rook-ceph-cluster.json (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/grafana-dashboards/rook-ceph-osd.json (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/grafana-dashboards/rook-ceph-pools.json (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/helmrelease/dashboard-cm.yaml (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/helmrelease/helmrelease.yaml (89%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/object-bucket-claims.yaml (89%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/objectbucketclaims/helmrelease.yaml (94%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/objectbucketclaims/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/pre-install.yaml (75%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/pre-install/ceph-crd-check.yaml (100%) rename services/rook-ceph-cluster/{1.12.7 => 1.14.2}/rook-ceph-cluster.yaml (86%) rename services/rook-ceph/{1.12.7 => 1.14.2}/defaults/cm.yaml (97%) rename services/rook-ceph/{1.12.7 => 1.14.2}/defaults/kustomization.yaml (100%) rename services/rook-ceph/{1.12.7 => 1.14.2}/helmrelease/helmrelease.yaml (89%) rename services/rook-ceph/{1.12.7 => 1.14.2}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph/{1.12.7 => 1.14.2}/kustomization.yaml (100%) rename services/rook-ceph/{1.12.7 => 1.14.2}/rook-ceph.yaml (90%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 30291838a..a12a9f0e4 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -290,7 +290,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/open-policy-agent/gatekeeper - - container_image: ghcr.io/mesosphere/dkp-container-images/rook/ceph:v1.12.6 + - container_image: ghcr.io/mesosphere/dkp-container-images/rook/ceph:v1.14.2 sources: - license_path: LICENSE ref: ${image_tag} @@ -451,7 +451,7 @@ resources: - license_path: LICENSE ref: ${image_tag} url: https://github.com/brancz/kube-rbac-proxy - - container_image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v17.2.6 + - container_image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v18.2.2 sources: - license_path: COPYING ref: ${image_tag} diff --git a/services/dkp-insights/1.1.1/defaults/cm.yaml b/services/dkp-insights/1.1.1/defaults/cm.yaml index d4b62148a..3d96ac2af 100644 --- a/services/dkp-insights/1.1.1/defaults/cm.yaml +++ b/services/dkp-insights/1.1.1/defaults/cm.yaml @@ -123,7 +123,7 @@ data: groupKind: group: kustomize.toolkit.fluxcd.io kind: Kustomization - nameRegexp: ai-navigator-cluster-info-agent-helmrelease|ai-navigator-cluster-info-api-helmrelease|centralized-kubecost-post-install-jobs|centralized-kubecost-release|cert-manager-namespace|cert-manager-priorityclass-resource-quota|cert-manager-release|cert-manager-root-ca|dkp-insights-helmrelease|dkp-insights-management-helmrelease|etcd-metrics-proxy|gatekeeper-constraint-templates|gatekeeper-constraints|gatekeeper-release|grafana-loki-helmrelease|grafana-loki-pre-install|istio-helmrelease|jaeger-helmrelease|kube-federation-system-namespace|kube-prometheus-stack-helmrelease|kubefed-federatedtypeconfigs|kubefed-release|nvidia-gpu-operator-helmrelease|object-bucket-claims-helmrelease|prometheus-adapter-helmrelease|rook-ceph-cluster-helmrelease|rook-ceph-cluster-prereq-jobs-v1.12.7|rook-ceph-helmrelease|thanos-jobs|velero-helmrelease|velero-post-install|velero-pre-install + nameRegexp: ai-navigator-cluster-info-agent-helmrelease|ai-navigator-cluster-info-api-helmrelease|centralized-kubecost-post-install-jobs|centralized-kubecost-release|cert-manager-namespace|cert-manager-priorityclass-resource-quota|cert-manager-release|cert-manager-root-ca|dkp-insights-helmrelease|dkp-insights-management-helmrelease|etcd-metrics-proxy|gatekeeper-constraint-templates|gatekeeper-constraints|gatekeeper-release|grafana-loki-helmrelease|grafana-loki-pre-install|istio-helmrelease|jaeger-helmrelease|kube-federation-system-namespace|kube-prometheus-stack-helmrelease|kubefed-federatedtypeconfigs|kubefed-release|nvidia-gpu-operator-helmrelease|object-bucket-claims-helmrelease|prometheus-adapter-helmrelease|rook-ceph-cluster-helmrelease|rook-ceph-cluster-prereq-jobs-v1.14.2|rook-ceph-helmrelease|thanos-jobs|velero-helmrelease|velero-post-install|velero-pre-install Namespace-additional: groupKind: group: "" diff --git a/services/rook-ceph-cluster/1.12.7/defaults/cm.yaml b/services/rook-ceph-cluster/1.14.2/defaults/cm.yaml similarity index 99% rename from services/rook-ceph-cluster/1.12.7/defaults/cm.yaml rename to services/rook-ceph-cluster/1.14.2/defaults/cm.yaml index e5c505d4a..a75d4d039 100644 --- a/services/rook-ceph-cluster/1.12.7/defaults/cm.yaml +++ b/services/rook-ceph-cluster/1.14.2/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: rook-ceph-cluster-1.12.7-d2iq-defaults + name: rook-ceph-cluster-1.14.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -25,7 +25,7 @@ data: cephVersion: # This image was patched to fix CVEs. To build new version of the image: # See: https://github.com/mesosphere/dkp-container-images - image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v17.2.6 + image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v18.2.2 resources: mgr-sidecar: diff --git a/services/rook-ceph-cluster/1.12.7/defaults/kustomization.yaml b/services/rook-ceph-cluster/1.14.2/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.7/defaults/kustomization.yaml rename to services/rook-ceph-cluster/1.14.2/defaults/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.7/grafana-dashboards/kustomization.yaml b/services/rook-ceph-cluster/1.14.2/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.7/grafana-dashboards/kustomization.yaml rename to services/rook-ceph-cluster/1.14.2/grafana-dashboards/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.7/grafana-dashboards/rook-ceph-cluster.json b/services/rook-ceph-cluster/1.14.2/grafana-dashboards/rook-ceph-cluster.json similarity index 100% rename from services/rook-ceph-cluster/1.12.7/grafana-dashboards/rook-ceph-cluster.json rename to services/rook-ceph-cluster/1.14.2/grafana-dashboards/rook-ceph-cluster.json diff --git a/services/rook-ceph-cluster/1.12.7/grafana-dashboards/rook-ceph-osd.json b/services/rook-ceph-cluster/1.14.2/grafana-dashboards/rook-ceph-osd.json similarity index 100% rename from services/rook-ceph-cluster/1.12.7/grafana-dashboards/rook-ceph-osd.json rename to services/rook-ceph-cluster/1.14.2/grafana-dashboards/rook-ceph-osd.json diff --git a/services/rook-ceph-cluster/1.12.7/grafana-dashboards/rook-ceph-pools.json b/services/rook-ceph-cluster/1.14.2/grafana-dashboards/rook-ceph-pools.json similarity index 100% rename from services/rook-ceph-cluster/1.12.7/grafana-dashboards/rook-ceph-pools.json rename to services/rook-ceph-cluster/1.14.2/grafana-dashboards/rook-ceph-pools.json diff --git a/services/rook-ceph-cluster/1.12.7/helmrelease/dashboard-cm.yaml b/services/rook-ceph-cluster/1.14.2/helmrelease/dashboard-cm.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.7/helmrelease/dashboard-cm.yaml rename to services/rook-ceph-cluster/1.14.2/helmrelease/dashboard-cm.yaml diff --git a/services/rook-ceph-cluster/1.12.7/helmrelease/helmrelease.yaml b/services/rook-ceph-cluster/1.14.2/helmrelease/helmrelease.yaml similarity index 89% rename from services/rook-ceph-cluster/1.12.7/helmrelease/helmrelease.yaml rename to services/rook-ceph-cluster/1.14.2/helmrelease/helmrelease.yaml index 4947af2a4..4b106c419 100644 --- a/services/rook-ceph-cluster/1.12.7/helmrelease/helmrelease.yaml +++ b/services/rook-ceph-cluster/1.14.2/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: charts.rook.io-release namespace: kommander-flux - version: v1.12.6 + version: v1.14.2 timeout: 15m interval: 15s install: @@ -26,5 +26,5 @@ spec: releaseName: rook-ceph-cluster valuesFrom: - kind: ConfigMap - name: rook-ceph-cluster-1.12.7-d2iq-defaults + name: rook-ceph-cluster-1.14.2-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph-cluster/1.12.7/helmrelease/kustomization.yaml b/services/rook-ceph-cluster/1.14.2/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.7/helmrelease/kustomization.yaml rename to services/rook-ceph-cluster/1.14.2/helmrelease/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.7/kustomization.yaml b/services/rook-ceph-cluster/1.14.2/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.7/kustomization.yaml rename to services/rook-ceph-cluster/1.14.2/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.7/object-bucket-claims.yaml b/services/rook-ceph-cluster/1.14.2/object-bucket-claims.yaml similarity index 89% rename from services/rook-ceph-cluster/1.12.7/object-bucket-claims.yaml rename to services/rook-ceph-cluster/1.14.2/object-bucket-claims.yaml index ba3bb7e9f..cce65be37 100644 --- a/services/rook-ceph-cluster/1.12.7/object-bucket-claims.yaml +++ b/services/rook-ceph-cluster/1.14.2/object-bucket-claims.yaml @@ -13,7 +13,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.12.7/objectbucketclaims + path: ./services/rook-ceph-cluster/1.14.2/objectbucketclaims sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph-cluster/1.12.7/objectbucketclaims/helmrelease.yaml b/services/rook-ceph-cluster/1.14.2/objectbucketclaims/helmrelease.yaml similarity index 94% rename from services/rook-ceph-cluster/1.12.7/objectbucketclaims/helmrelease.yaml rename to services/rook-ceph-cluster/1.14.2/objectbucketclaims/helmrelease.yaml index 92ae12fe6..f6c5f29f7 100644 --- a/services/rook-ceph-cluster/1.12.7/objectbucketclaims/helmrelease.yaml +++ b/services/rook-ceph-cluster/1.14.2/objectbucketclaims/helmrelease.yaml @@ -26,7 +26,7 @@ spec: releaseName: object-bucket-claims valuesFrom: - kind: ConfigMap - name: rook-ceph-cluster-1.12.7-d2iq-defaults + name: rook-ceph-cluster-1.14.2-d2iq-defaults - kind: ConfigMap name: rook-ceph-cluster-overrides optional: true diff --git a/services/rook-ceph-cluster/1.12.7/objectbucketclaims/kustomization.yaml b/services/rook-ceph-cluster/1.14.2/objectbucketclaims/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.7/objectbucketclaims/kustomization.yaml rename to services/rook-ceph-cluster/1.14.2/objectbucketclaims/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.7/pre-install.yaml b/services/rook-ceph-cluster/1.14.2/pre-install.yaml similarity index 75% rename from services/rook-ceph-cluster/1.12.7/pre-install.yaml rename to services/rook-ceph-cluster/1.14.2/pre-install.yaml index fed84606d..8bb9c7cdb 100644 --- a/services/rook-ceph-cluster/1.12.7/pre-install.yaml +++ b/services/rook-ceph-cluster/1.14.2/pre-install.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: rook-ceph-cluster-prereq-jobs-v1.12.7 + name: rook-ceph-cluster-prereq-jobs-v1.14.2 namespace: ${releaseNamespace} spec: force: true @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.12.7/pre-install + path: ./services/rook-ceph-cluster/1.14.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.12.6 + desiredCephOperatorVersion: v1.14.2 diff --git a/services/rook-ceph-cluster/1.12.7/pre-install/ceph-crd-check.yaml b/services/rook-ceph-cluster/1.14.2/pre-install/ceph-crd-check.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.7/pre-install/ceph-crd-check.yaml rename to services/rook-ceph-cluster/1.14.2/pre-install/ceph-crd-check.yaml diff --git a/services/rook-ceph-cluster/1.12.7/rook-ceph-cluster.yaml b/services/rook-ceph-cluster/1.14.2/rook-ceph-cluster.yaml similarity index 86% rename from services/rook-ceph-cluster/1.12.7/rook-ceph-cluster.yaml rename to services/rook-ceph-cluster/1.14.2/rook-ceph-cluster.yaml index 22e47f2f0..f03cdd607 100644 --- a/services/rook-ceph-cluster/1.12.7/rook-ceph-cluster.yaml +++ b/services/rook-ceph-cluster/1.14.2/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.12.7 + - name: rook-ceph-cluster-prereq-jobs-v1.14.2 namespace: ${workspaceNamespace} force: false prune: true wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.12.7/helmrelease + path: ./services/rook-ceph-cluster/1.14.2/helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph/1.12.7/defaults/cm.yaml b/services/rook-ceph/1.14.2/defaults/cm.yaml similarity index 97% rename from services/rook-ceph/1.12.7/defaults/cm.yaml rename to services/rook-ceph/1.14.2/defaults/cm.yaml index 62c2354e2..652704dbf 100644 --- a/services/rook-ceph/1.12.7/defaults/cm.yaml +++ b/services/rook-ceph/1.14.2/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: rook-ceph-1.12.7-d2iq-defaults + name: rook-ceph-1.14.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/rook-ceph/1.12.7/defaults/kustomization.yaml b/services/rook-ceph/1.14.2/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.12.7/defaults/kustomization.yaml rename to services/rook-ceph/1.14.2/defaults/kustomization.yaml diff --git a/services/rook-ceph/1.12.7/helmrelease/helmrelease.yaml b/services/rook-ceph/1.14.2/helmrelease/helmrelease.yaml similarity index 89% rename from services/rook-ceph/1.12.7/helmrelease/helmrelease.yaml rename to services/rook-ceph/1.14.2/helmrelease/helmrelease.yaml index 073c07cfc..feec932b6 100644 --- a/services/rook-ceph/1.12.7/helmrelease/helmrelease.yaml +++ b/services/rook-ceph/1.14.2/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: charts.rook.io-release namespace: kommander-flux - version: v1.12.6 + version: v1.14.2 interval: 15s install: crds: CreateReplace @@ -25,5 +25,5 @@ spec: releaseName: rook-ceph valuesFrom: - kind: ConfigMap - name: rook-ceph-1.12.7-d2iq-defaults + name: rook-ceph-1.14.2-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph/1.12.7/helmrelease/kustomization.yaml b/services/rook-ceph/1.14.2/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.12.7/helmrelease/kustomization.yaml rename to services/rook-ceph/1.14.2/helmrelease/kustomization.yaml diff --git a/services/rook-ceph/1.12.7/kustomization.yaml b/services/rook-ceph/1.14.2/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.12.7/kustomization.yaml rename to services/rook-ceph/1.14.2/kustomization.yaml diff --git a/services/rook-ceph/1.12.7/rook-ceph.yaml b/services/rook-ceph/1.14.2/rook-ceph.yaml similarity index 90% rename from services/rook-ceph/1.12.7/rook-ceph.yaml rename to services/rook-ceph/1.14.2/rook-ceph.yaml index 4e9e74b7f..7a8110f0f 100644 --- a/services/rook-ceph/1.12.7/rook-ceph.yaml +++ b/services/rook-ceph/1.14.2/rook-ceph.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph/1.12.7/helmrelease + path: ./services/rook-ceph/1.14.2/helmrelease sourceRef: kind: GitRepository name: management