Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Bump rook-ceph to v1.15.5 #2841

Merged
merged 2 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions licenses.d2iq.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,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.14.5
- container_image: docker.io/rook/ceph:v1.15.5
sources:
- license_path: LICENSE
ref: ${image_tag}
Expand Down Expand Up @@ -383,7 +383,7 @@ resources:
- license_path: LICENSE
ref: ${image_tag%-ubuntu22.04}
url: https://github.com/NVIDIA/dcgm-exporter
- container_image: ghcr.io/mesosphere/dkp-container-images/ceph/ceph:v18.2.2
- container_image: quay.io/ceph/ceph:v18.2.4
sources:
- license_path: COPYING
ref: ${image_tag}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: rook-ceph-cluster-1.14.5-d2iq-defaults
name: rook-ceph-cluster-1.15.5-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: |
Expand All @@ -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:v18.2.2
image: quay.io/ceph/ceph:v18.2.4

resources:
mgr-sidecar:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ data:
name: "Rook Ceph Cluster"
dashboardLink: "/dkp/kommander/ceph-dashboard/"
docsLink: "https://docs.ceph.com/en/latest/mgr/dashboard/"
# Rook Ceph Version can be found at https://github.com/rook/rook/blob/v1.11.9/deploy/charts/rook-ceph-cluster/values.yaml#L89
version: "17.2.6"
# Rook Ceph Version can be found at https://github.com/rook/rook/blob/v1.15.5/deploy/charts/rook-ceph-cluster/values.yaml#L97
version: "18.2.4"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
kind: HelmRepository
name: charts.rook.io-release
namespace: kommander-flux
version: v1.14.5
version: v1.15.5
timeout: 15m
interval: 15s
install:
Expand All @@ -26,5 +26,5 @@ spec:
releaseName: rook-ceph-cluster
valuesFrom:
- kind: ConfigMap
name: rook-ceph-cluster-1.14.5-d2iq-defaults
name: rook-ceph-cluster-1.15.5-d2iq-defaults
targetNamespace: ${releaseNamespace}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph-cluster/1.14.5/objectbucketclaims
path: ./services/rook-ceph-cluster/1.15.5/objectbucketclaims
sourceRef:
kind: GitRepository
name: management
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
releaseName: object-bucket-claims
valuesFrom:
- kind: ConfigMap
name: rook-ceph-cluster-1.14.5-d2iq-defaults
name: rook-ceph-cluster-1.15.5-d2iq-defaults
- kind: ConfigMap
name: rook-ceph-cluster-overrides
optional: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apiVersion: kustomize.toolkit.fluxcd.io/v1
kind: Kustomization
metadata:
name: rook-ceph-cluster-prereq-jobs-v1.14.5
name: rook-ceph-cluster-prereq-jobs-v1.15.5
namespace: ${releaseNamespace}
spec:
force: true
prune: true
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph-cluster/1.14.5/pre-install
path: ./services/rook-ceph-cluster/1.15.5/pre-install
sourceRef:
kind: GitRepository
name: management
Expand All @@ -19,4 +19,4 @@ spec:
substitute:
releaseNamespace: ${releaseNamespace}
# Update the following version whenever ceph-cluster service is bumped.
desiredCephOperatorVersion: v1.14.5
desiredCephOperatorVersion: v1.15.5
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.5
- name: rook-ceph-cluster-prereq-jobs-v1.15.5
namespace: ${workspaceNamespace}
force: false
prune: true
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph-cluster/1.14.5/helmrelease
path: ./services/rook-ceph-cluster/1.15.5/helmrelease
sourceRef:
kind: GitRepository
name: management
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: rook-ceph-1.14.5-d2iq-defaults
name: rook-ceph-1.15.5-d2iq-defaults
namespace: ${releaseNamespace}
data:
values.yaml: |
---
image:
# This image was patched to fix CVEs. To build new version of the image:
# See: https://github.com/mesosphere/dkp-container-images
repository: ghcr.io/mesosphere/dkp-container-images/rook/ceph

crds:
# CRDs are not installed with "crds" directory and If this flag is disabled post-install, the cluster may be DESTROYED.
# If the CRDs are deleted in this case, see the disaster recovery guide to restore them.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
kind: HelmRepository
name: charts.rook.io-release
namespace: kommander-flux
version: v1.14.5
version: v1.15.5
interval: 15s
install:
crds: CreateReplace
Expand All @@ -25,5 +25,5 @@ spec:
releaseName: rook-ceph
valuesFrom:
- kind: ConfigMap
name: rook-ceph-1.14.5-d2iq-defaults
name: rook-ceph-1.15.5-d2iq-defaults
targetNamespace: ${releaseNamespace}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
wait: true
interval: 6h
retryInterval: 1m
path: ./services/rook-ceph/1.14.5/helmrelease
path: ./services/rook-ceph/1.15.5/helmrelease
sourceRef:
kind: GitRepository
name: management
Expand Down
Loading