From b1650e218ed1daa7902883de0ea98b544d0aff24 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:03 +0000 Subject: [PATCH 1/6] chore: Update rook-ceph 1.12.1 => 1.12.3 --- services/rook-ceph/1.12.1/defaults/cm.yaml | 2 +- services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml | 4 ++-- services/rook-ceph/1.12.1/rook-ceph.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/rook-ceph/1.12.1/defaults/cm.yaml b/services/rook-ceph/1.12.1/defaults/cm.yaml index 6d6adcab5..deee02cd3 100644 --- a/services/rook-ceph/1.12.1/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.12.1-d2iq-defaults + name: rook-ceph-1.12.3-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml b/services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml index d84cf258b..0d025e4d2 100644 --- a/services/rook-ceph/1.12.1/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.12.1 + version: v1.12.3 interval: 15s install: crds: CreateReplace @@ -25,5 +25,5 @@ spec: releaseName: rook-ceph valuesFrom: - kind: ConfigMap - name: rook-ceph-1.12.1-d2iq-defaults + name: rook-ceph-1.12.3-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph/1.12.1/rook-ceph.yaml b/services/rook-ceph/1.12.1/rook-ceph.yaml index 20a6de35c..6deaf3659 100644 --- a/services/rook-ceph/1.12.1/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.12.1/helmrelease + path: ./services/rook-ceph/1.12.3/helmrelease sourceRef: kind: GitRepository name: management From bb821b05c02761052559e6f07ab66a93ded41f67 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:03 +0000 Subject: [PATCH 2/6] chore: Move rook-ceph/1.12.1 => 1.12.3 --- services/rook-ceph/{1.12.1 => 1.12.3}/defaults/cm.yaml | 0 services/rook-ceph/{1.12.1 => 1.12.3}/defaults/kustomization.yaml | 0 .../rook-ceph/{1.12.1 => 1.12.3}/helmrelease/helmrelease.yaml | 0 .../rook-ceph/{1.12.1 => 1.12.3}/helmrelease/kustomization.yaml | 0 services/rook-ceph/{1.12.1 => 1.12.3}/kustomization.yaml | 0 services/rook-ceph/{1.12.1 => 1.12.3}/rook-ceph.yaml | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename services/rook-ceph/{1.12.1 => 1.12.3}/defaults/cm.yaml (100%) rename services/rook-ceph/{1.12.1 => 1.12.3}/defaults/kustomization.yaml (100%) rename services/rook-ceph/{1.12.1 => 1.12.3}/helmrelease/helmrelease.yaml (100%) rename services/rook-ceph/{1.12.1 => 1.12.3}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph/{1.12.1 => 1.12.3}/kustomization.yaml (100%) rename services/rook-ceph/{1.12.1 => 1.12.3}/rook-ceph.yaml (100%) diff --git a/services/rook-ceph/1.12.1/defaults/cm.yaml b/services/rook-ceph/1.12.3/defaults/cm.yaml similarity index 100% rename from services/rook-ceph/1.12.1/defaults/cm.yaml rename to services/rook-ceph/1.12.3/defaults/cm.yaml diff --git a/services/rook-ceph/1.12.1/defaults/kustomization.yaml b/services/rook-ceph/1.12.3/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.12.1/defaults/kustomization.yaml rename to services/rook-ceph/1.12.3/defaults/kustomization.yaml diff --git a/services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml b/services/rook-ceph/1.12.3/helmrelease/helmrelease.yaml similarity index 100% rename from services/rook-ceph/1.12.1/helmrelease/helmrelease.yaml rename to services/rook-ceph/1.12.3/helmrelease/helmrelease.yaml diff --git a/services/rook-ceph/1.12.1/helmrelease/kustomization.yaml b/services/rook-ceph/1.12.3/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.12.1/helmrelease/kustomization.yaml rename to services/rook-ceph/1.12.3/helmrelease/kustomization.yaml diff --git a/services/rook-ceph/1.12.1/kustomization.yaml b/services/rook-ceph/1.12.3/kustomization.yaml similarity index 100% rename from services/rook-ceph/1.12.1/kustomization.yaml rename to services/rook-ceph/1.12.3/kustomization.yaml diff --git a/services/rook-ceph/1.12.1/rook-ceph.yaml b/services/rook-ceph/1.12.3/rook-ceph.yaml similarity index 100% rename from services/rook-ceph/1.12.1/rook-ceph.yaml rename to services/rook-ceph/1.12.3/rook-ceph.yaml From 411c5808ac836ff21e203e0022c47c7db9c8ccda Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:09 +0000 Subject: [PATCH 3/6] chore: Update rook-ceph-cluster 1.12.1 => 1.12.3 --- services/rook-ceph-cluster/1.12.1/defaults/cm.yaml | 2 +- .../rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml | 4 ++-- services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml | 2 +- .../1.12.1/objectbucketclaims/helmrelease.yaml | 2 +- services/rook-ceph-cluster/1.12.1/pre-install.yaml | 2 +- services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/rook-ceph-cluster/1.12.1/defaults/cm.yaml b/services/rook-ceph-cluster/1.12.1/defaults/cm.yaml index 592ab47cc..daaf86798 100644 --- a/services/rook-ceph-cluster/1.12.1/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.12.1-d2iq-defaults + name: rook-ceph-cluster-1.12.3-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml b/services/rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml index 31119c244..d88586aba 100644 --- a/services/rook-ceph-cluster/1.12.1/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.12.1 + version: v1.12.3 timeout: 15m interval: 15s install: @@ -26,5 +26,5 @@ spec: releaseName: rook-ceph-cluster valuesFrom: - kind: ConfigMap - name: rook-ceph-cluster-1.12.1-d2iq-defaults + name: rook-ceph-cluster-1.12.3-d2iq-defaults targetNamespace: ${releaseNamespace} diff --git a/services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml b/services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml index a4b7c932e..03565f0e4 100644 --- a/services/rook-ceph-cluster/1.12.1/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.12.1/objectbucketclaims + path: ./services/rook-ceph-cluster/1.12.3/objectbucketclaims sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph-cluster/1.12.1/objectbucketclaims/helmrelease.yaml b/services/rook-ceph-cluster/1.12.1/objectbucketclaims/helmrelease.yaml index 9008a3e43..313dcef12 100644 --- a/services/rook-ceph-cluster/1.12.1/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.12.1-d2iq-defaults + name: rook-ceph-cluster-1.12.3-d2iq-defaults - kind: ConfigMap name: rook-ceph-cluster-overrides optional: true diff --git a/services/rook-ceph-cluster/1.12.1/pre-install.yaml b/services/rook-ceph-cluster/1.12.1/pre-install.yaml index 7c7b84be7..312e1fe75 100644 --- a/services/rook-ceph-cluster/1.12.1/pre-install.yaml +++ b/services/rook-ceph-cluster/1.12.1/pre-install.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.12.1/pre-install + path: ./services/rook-ceph-cluster/1.12.3/pre-install sourceRef: kind: GitRepository name: management diff --git a/services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml b/services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml index 9bcc27fd4..83cb89ab9 100644 --- a/services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml +++ b/services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml @@ -13,7 +13,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/rook-ceph-cluster/1.12.1/helmrelease + path: ./services/rook-ceph-cluster/1.12.3/helmrelease sourceRef: kind: GitRepository name: management From 82c8257d215075e918f664a15b6d41ef6619ac70 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Fri, 1 Sep 2023 00:22:10 +0000 Subject: [PATCH 4/6] chore: Move rook-ceph-cluster/1.12.1 => 1.12.3 --- services/rook-ceph-cluster/{1.12.1 => 1.12.3}/defaults/cm.yaml | 0 .../{1.12.1 => 1.12.3}/defaults/kustomization.yaml | 0 .../{1.12.1 => 1.12.3}/grafana-dashboards/kustomization.yaml | 0 .../{1.12.1 => 1.12.3}/grafana-dashboards/rook-ceph-cluster.json | 0 .../{1.12.1 => 1.12.3}/grafana-dashboards/rook-ceph-osd.json | 0 .../{1.12.1 => 1.12.3}/grafana-dashboards/rook-ceph-pools.json | 0 .../{1.12.1 => 1.12.3}/helmrelease/dashboard-cm.yaml | 0 .../{1.12.1 => 1.12.3}/helmrelease/helmrelease.yaml | 0 .../{1.12.1 => 1.12.3}/helmrelease/kustomization.yaml | 0 services/rook-ceph-cluster/{1.12.1 => 1.12.3}/kustomization.yaml | 0 .../{1.12.1 => 1.12.3}/object-bucket-claims.yaml | 0 .../{1.12.1 => 1.12.3}/objectbucketclaims/helmrelease.yaml | 0 .../{1.12.1 => 1.12.3}/objectbucketclaims/kustomization.yaml | 0 services/rook-ceph-cluster/{1.12.1 => 1.12.3}/pre-install.yaml | 0 .../{1.12.1 => 1.12.3}/pre-install/ceph-crd-check.yaml | 0 .../rook-ceph-cluster/{1.12.1 => 1.12.3}/rook-ceph-cluster.yaml | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/defaults/cm.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/defaults/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/grafana-dashboards/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/grafana-dashboards/rook-ceph-cluster.json (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/grafana-dashboards/rook-ceph-osd.json (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/grafana-dashboards/rook-ceph-pools.json (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/helmrelease/dashboard-cm.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/helmrelease/helmrelease.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/helmrelease/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/object-bucket-claims.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/objectbucketclaims/helmrelease.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/objectbucketclaims/kustomization.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/pre-install.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/pre-install/ceph-crd-check.yaml (100%) rename services/rook-ceph-cluster/{1.12.1 => 1.12.3}/rook-ceph-cluster.yaml (100%) diff --git a/services/rook-ceph-cluster/1.12.1/defaults/cm.yaml b/services/rook-ceph-cluster/1.12.3/defaults/cm.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/defaults/cm.yaml rename to services/rook-ceph-cluster/1.12.3/defaults/cm.yaml diff --git a/services/rook-ceph-cluster/1.12.1/defaults/kustomization.yaml b/services/rook-ceph-cluster/1.12.3/defaults/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/defaults/kustomization.yaml rename to services/rook-ceph-cluster/1.12.3/defaults/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.1/grafana-dashboards/kustomization.yaml b/services/rook-ceph-cluster/1.12.3/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/grafana-dashboards/kustomization.yaml rename to services/rook-ceph-cluster/1.12.3/grafana-dashboards/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-cluster.json b/services/rook-ceph-cluster/1.12.3/grafana-dashboards/rook-ceph-cluster.json similarity index 100% rename from services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-cluster.json rename to services/rook-ceph-cluster/1.12.3/grafana-dashboards/rook-ceph-cluster.json diff --git a/services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-osd.json b/services/rook-ceph-cluster/1.12.3/grafana-dashboards/rook-ceph-osd.json similarity index 100% rename from services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-osd.json rename to services/rook-ceph-cluster/1.12.3/grafana-dashboards/rook-ceph-osd.json diff --git a/services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-pools.json b/services/rook-ceph-cluster/1.12.3/grafana-dashboards/rook-ceph-pools.json similarity index 100% rename from services/rook-ceph-cluster/1.12.1/grafana-dashboards/rook-ceph-pools.json rename to services/rook-ceph-cluster/1.12.3/grafana-dashboards/rook-ceph-pools.json diff --git a/services/rook-ceph-cluster/1.12.1/helmrelease/dashboard-cm.yaml b/services/rook-ceph-cluster/1.12.3/helmrelease/dashboard-cm.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/helmrelease/dashboard-cm.yaml rename to services/rook-ceph-cluster/1.12.3/helmrelease/dashboard-cm.yaml diff --git a/services/rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml b/services/rook-ceph-cluster/1.12.3/helmrelease/helmrelease.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/helmrelease/helmrelease.yaml rename to services/rook-ceph-cluster/1.12.3/helmrelease/helmrelease.yaml diff --git a/services/rook-ceph-cluster/1.12.1/helmrelease/kustomization.yaml b/services/rook-ceph-cluster/1.12.3/helmrelease/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/helmrelease/kustomization.yaml rename to services/rook-ceph-cluster/1.12.3/helmrelease/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.1/kustomization.yaml b/services/rook-ceph-cluster/1.12.3/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/kustomization.yaml rename to services/rook-ceph-cluster/1.12.3/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml b/services/rook-ceph-cluster/1.12.3/object-bucket-claims.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/object-bucket-claims.yaml rename to services/rook-ceph-cluster/1.12.3/object-bucket-claims.yaml diff --git a/services/rook-ceph-cluster/1.12.1/objectbucketclaims/helmrelease.yaml b/services/rook-ceph-cluster/1.12.3/objectbucketclaims/helmrelease.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/objectbucketclaims/helmrelease.yaml rename to services/rook-ceph-cluster/1.12.3/objectbucketclaims/helmrelease.yaml diff --git a/services/rook-ceph-cluster/1.12.1/objectbucketclaims/kustomization.yaml b/services/rook-ceph-cluster/1.12.3/objectbucketclaims/kustomization.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/objectbucketclaims/kustomization.yaml rename to services/rook-ceph-cluster/1.12.3/objectbucketclaims/kustomization.yaml diff --git a/services/rook-ceph-cluster/1.12.1/pre-install.yaml b/services/rook-ceph-cluster/1.12.3/pre-install.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/pre-install.yaml rename to services/rook-ceph-cluster/1.12.3/pre-install.yaml diff --git a/services/rook-ceph-cluster/1.12.1/pre-install/ceph-crd-check.yaml b/services/rook-ceph-cluster/1.12.3/pre-install/ceph-crd-check.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/pre-install/ceph-crd-check.yaml rename to services/rook-ceph-cluster/1.12.3/pre-install/ceph-crd-check.yaml diff --git a/services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml b/services/rook-ceph-cluster/1.12.3/rook-ceph-cluster.yaml similarity index 100% rename from services/rook-ceph-cluster/1.12.1/rook-ceph-cluster.yaml rename to services/rook-ceph-cluster/1.12.3/rook-ceph-cluster.yaml From ab1cf4409d3522a70fd917ab0e1290d6a6ce4112 Mon Sep 17 00:00:00 2001 From: d2iq-mergebot Date: Tue, 3 Oct 2023 00:25:05 +0000 Subject: [PATCH 5/6] build: Updated licenses.d2iq.yaml --- licenses.d2iq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index e5b03cda9..265796bde 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -301,7 +301,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/open-policy-agent/gatekeeper - - container_image: docker.io/rook/ceph:v1.12.1 + - container_image: docker.io/rook/ceph:v1.12.3 sources: - license_path: LICENSE ref: ${image_tag} From a1792d2a0bf31435b85f562233b38dc112bb00cd Mon Sep 17 00:00:00 2001 From: Grace Do Date: Fri, 13 Oct 2023 14:10:14 -0700 Subject: [PATCH 6/6] feat(ceph): Bump remaining versions --- services/rook-ceph-cluster/1.12.3/pre-install.yaml | 4 ++-- services/rook-ceph-cluster/1.12.3/rook-ceph-cluster.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/rook-ceph-cluster/1.12.3/pre-install.yaml b/services/rook-ceph-cluster/1.12.3/pre-install.yaml index 312e1fe75..8dc843000 100644 --- a/services/rook-ceph-cluster/1.12.3/pre-install.yaml +++ b/services/rook-ceph-cluster/1.12.3/pre-install.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: rook-ceph-cluster-prereq-jobs-v1.12.1 + name: rook-ceph-cluster-prereq-jobs-v1.12.3 namespace: ${releaseNamespace} spec: force: true @@ -19,4 +19,4 @@ spec: substitute: releaseNamespace: ${releaseNamespace} # Update the following version whenever ceph-cluster service is bumped. - desiredCephOperatorVersion: v1.12.1 + desiredCephOperatorVersion: v1.12.3 diff --git a/services/rook-ceph-cluster/1.12.3/rook-ceph-cluster.yaml b/services/rook-ceph-cluster/1.12.3/rook-ceph-cluster.yaml index 83cb89ab9..7e8deb138 100644 --- a/services/rook-ceph-cluster/1.12.3/rook-ceph-cluster.yaml +++ b/services/rook-ceph-cluster/1.12.3/rook-ceph-cluster.yaml @@ -6,7 +6,7 @@ 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.1 + - name: rook-ceph-cluster-prereq-jobs-v1.12.3 namespace: ${workspaceNamespace} force: false prune: true