From dae22d7054b03574917ab4cd8aa3c5e44d769191 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 17 Oct 2024 09:57:26 -0600 Subject: [PATCH] build: set the release version to v1.15.4 For the patch release update the docs and examples to v1.15.4 Signed-off-by: Travis Nielsen --- Documentation/Getting-Started/quickstart.md | 2 +- .../Monitoring/ceph-monitoring.md | 2 +- Documentation/Upgrade/rook-upgrade.md | 30 +++++++++---------- deploy/charts/rook-ceph/values.yaml | 2 +- deploy/examples/direct-mount.yaml | 2 +- deploy/examples/images.txt | 2 +- deploy/examples/operator-openshift.yaml | 2 +- deploy/examples/operator.yaml | 2 +- deploy/examples/osd-purge.yaml | 2 +- deploy/examples/toolbox-job.yaml | 4 +-- deploy/examples/toolbox-operator-image.yaml | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index bd62a1c437948..d2d962340bb41 100644 --- a/Documentation/Getting-Started/quickstart.md +++ b/Documentation/Getting-Started/quickstart.md @@ -36,7 +36,7 @@ To configure the Ceph storage cluster, at least one of these local storage optio A simple Rook cluster is created for Kubernetes with the following `kubectl` commands and [example manifests](https://github.com/rook/rook/blob/master/deploy/examples). ```console -$ git clone --single-branch --branch v1.15.3 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.15.4 https://github.com/rook/rook.git cd rook/deploy/examples kubectl create -f crds.yaml -f common.yaml -f operator.yaml kubectl create -f cluster.yaml diff --git a/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md b/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md index e33c84484b389..5b791497bf12c 100644 --- a/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md +++ b/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md @@ -48,7 +48,7 @@ There are two sources for metrics collection: From the root of your locally cloned Rook repo, go the monitoring directory: ```console -$ git clone --single-branch --branch v1.15.3 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.15.4 https://github.com/rook/rook.git cd rook/deploy/examples/monitoring ``` diff --git a/Documentation/Upgrade/rook-upgrade.md b/Documentation/Upgrade/rook-upgrade.md index a0d641df94cba..f2ff0695ab61f 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -80,11 +80,11 @@ With this upgrade guide, there are a few notes to consider: Unless otherwise noted due to extenuating requirements, upgrades from one patch release of Rook to another are as simple as updating the common resources and the image of the Rook operator. For -example, when Rook v1.15.3 is released, the process of updating from v1.15.0 is as simple as running +example, when Rook v1.15.4 is released, the process of updating from v1.15.0 is as simple as running the following: ```console -git clone --single-branch --depth=1 --branch v1.15.3 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.15.4 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -96,7 +96,7 @@ Then, apply the latest changes from v1.15, and update the Rook Operator image. ```console kubectl apply -f common.yaml -f crds.yaml -kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.15.3 +kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.15.4 ``` As exemplified above, it is a good practice to update Rook common resources from the example @@ -135,7 +135,7 @@ In order to successfully upgrade a Rook cluster, the following prerequisites mus ## Rook Operator Upgrade The examples given in this guide upgrade a live Rook cluster running `v1.14.11` to -the version `v1.15.3`. This upgrade should work from any official patch release of Rook v1.14 to any +the version `v1.15.4`. This upgrade should work from any official patch release of Rook v1.14 to any official patch release of v1.15. Let's get started! @@ -162,7 +162,7 @@ by the Operator. Also update the Custom Resource Definitions (CRDs). Get the latest common resources manifests that contain the latest changes. ```console -git clone --single-branch --depth=1 --branch v1.15.3 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.15.4 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -201,7 +201,7 @@ The largest portion of the upgrade is triggered when the operator's image is upd When the operator is updated, it will proceed to update all of the Ceph daemons. ```console -kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.15.3 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.15.4 ``` ### **3. Update Ceph CSI** @@ -231,16 +231,16 @@ watch --exec kubectl -n $ROOK_CLUSTER_NAMESPACE get deployments -l rook_cluster= ``` As an example, this cluster is midway through updating the OSDs. When all deployments report `1/1/1` -availability and `rook-version=v1.15.3`, the Ceph cluster's core components are fully updated. +availability and `rook-version=v1.15.4`, the Ceph cluster's core components are fully updated. ```console Every 2.0s: kubectl -n rook-ceph get deployment -o j... -rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.15.3 -rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.15.3 -rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.15.3 -rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.15.3 -rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.15.3 +rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.15.4 +rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.15.4 +rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.15.4 +rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.15.4 +rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.15.4 rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.14.11 rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.14.11 ``` @@ -252,14 +252,14 @@ An easy check to see if the upgrade is totally finished is to check that there i # kubectl -n $ROOK_CLUSTER_NAMESPACE get deployment -l rook_cluster=$ROOK_CLUSTER_NAMESPACE -o jsonpath='{range .items[*]}{"rook-version="}{.metadata.labels.rook-version}{"\n"}{end}' | sort | uniq This cluster is not yet finished: rook-version=v1.14.11 - rook-version=v1.15.3 + rook-version=v1.15.4 This cluster is finished: - rook-version=v1.15.3 + rook-version=v1.15.4 ``` ### **5. Verify the updated cluster** -At this point, the Rook operator should be running version `rook/ceph:v1.15.3`. +At this point, the Rook operator should be running version `rook/ceph:v1.15.4`. Verify the CephCluster health using the [health verification doc](health-verification.md). diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index bbaf809d5a8f6..d8cf773f25d85 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -7,7 +7,7 @@ image: repository: docker.io/rook/ceph # -- Image tag # @default -- `master` - tag: v1.15.3 + tag: v1.15.4 # -- Image pull policy pullPolicy: IfNotPresent diff --git a/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index 85aae717b57c9..4401b12a46968 100644 --- a/deploy/examples/direct-mount.yaml +++ b/deploy/examples/direct-mount.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: rook-ceph-default containers: - name: rook-direct-mount - image: docker.io/rook/ceph:v1.15.3 + image: docker.io/rook/ceph:v1.15.4 command: ["/bin/bash"] args: ["-m", "-c", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index 9b0750875f7ee..b626f415d26ed 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -1,4 +1,4 @@ - docker.io/rook/ceph:v1.15.3 + docker.io/rook/ceph:v1.15.4 gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 quay.io/ceph/ceph:v18.2.4 quay.io/ceph/cosi:v0.1.2 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index d522f05d5069d..ee4a307da3918 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -679,7 +679,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: docker.io/rook/ceph:v1.15.3 + image: docker.io/rook/ceph:v1.15.4 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 9c0a4ddd01b5a..7778ef2f72e01 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -608,7 +608,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: docker.io/rook/ceph:v1.15.3 + image: docker.io/rook/ceph:v1.15.4 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index 11a5ffd75cd5e..e1a668e6356e4 100644 --- a/deploy/examples/osd-purge.yaml +++ b/deploy/examples/osd-purge.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: rook-ceph-purge-osd containers: - name: osd-removal - image: docker.io/rook/ceph:v1.15.3 + image: docker.io/rook/ceph:v1.15.4 # TODO: Insert the OSD ID in the last parameter that is to be removed # The OSD IDs are a comma-separated list. For example: "0" or "0,2". # If you want to preserve the OSD PVCs, set `--preserve-pvc true`. diff --git a/deploy/examples/toolbox-job.yaml b/deploy/examples/toolbox-job.yaml index 9a16d73bbc3a0..88881b187a9a3 100644 --- a/deploy/examples/toolbox-job.yaml +++ b/deploy/examples/toolbox-job.yaml @@ -10,7 +10,7 @@ spec: spec: initContainers: - name: config-init - image: docker.io/rook/ceph:v1.15.3 + image: docker.io/rook/ceph:v1.15.4 command: ["/usr/local/bin/toolbox.sh"] args: ["--skip-watch"] imagePullPolicy: IfNotPresent @@ -29,7 +29,7 @@ spec: mountPath: /var/lib/rook-ceph-mon containers: - name: script - image: docker.io/rook/ceph:v1.15.3 + image: docker.io/rook/ceph:v1.15.4 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/deploy/examples/toolbox-operator-image.yaml b/deploy/examples/toolbox-operator-image.yaml index cdb068d599088..325d8921c5c8b 100644 --- a/deploy/examples/toolbox-operator-image.yaml +++ b/deploy/examples/toolbox-operator-image.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: rook-ceph-default containers: - name: rook-ceph-tools-operator-image - image: docker.io/rook/ceph:v1.15.3 + image: docker.io/rook/ceph:v1.15.4 command: - /bin/bash - -c