From 297e582f2d0ff88f6ed10ba1d4e600333d126433 Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Thu, 20 Jun 2024 15:40:37 -0600 Subject: [PATCH] build: set release version to v1.14.7 For the patch release update the examples and documentation to v1.14.7 Signed-off-by: Blaine Gardner --- 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/multus-validation.yaml | 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 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index 1991d973d..18382e727 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.14.6 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.14.7 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 9b53ab827..7e6f531ac 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.14.6 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.14.7 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 32aa4e1c8..941c4fd97 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -79,11 +79,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.14.6 is released, the process of updating from v1.14.0 is as simple as running +example, when Rook v1.14.7 is released, the process of updating from v1.14.0 is as simple as running the following: ```console -git clone --single-branch --depth=1 --branch v1.14.6 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.14.7 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -95,7 +95,7 @@ Then, apply the latest changes from v1.14, 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.14.6 +kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.14.7 ``` As exemplified above, it is a good practice to update Rook common resources from the example @@ -134,7 +134,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.13.9` to -the version `v1.14.6`. This upgrade should work from any official patch release of Rook v1.13 to any +the version `v1.14.7`. This upgrade should work from any official patch release of Rook v1.13 to any official patch release of v1.14. Let's get started! @@ -161,7 +161,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.14.6 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.14.7 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -200,7 +200,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.14.6 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.14.7 ``` ### **3. Update Ceph CSI** @@ -230,16 +230,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.14.6`, the Ceph cluster's core components are fully updated. +availability and `rook-version=v1.14.7`, 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.14.6 -rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.14.6 -rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.14.6 -rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.14.6 -rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.14.6 +rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.14.7 +rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.14.7 +rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.14.7 +rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.14.7 +rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.14.7 rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.13.9 rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.13.9 ``` @@ -251,14 +251,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.13.9 - rook-version=v1.14.6 + rook-version=v1.14.7 This cluster is finished: - rook-version=v1.14.6 + rook-version=v1.14.7 ``` ### **5. Verify the updated cluster** -At this point, the Rook operator should be running version `rook/ceph:v1.14.6`. +At this point, the Rook operator should be running version `rook/ceph:v1.14.7`. 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 5c17290aa..e4c63f692 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -7,7 +7,7 @@ image: repository: rook/ceph # -- Image tag # @default -- `master` - tag: v1.14.6 + tag: v1.14.7 # -- Image pull policy pullPolicy: IfNotPresent diff --git a/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index 858d22582..cc84b7d98 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: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 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 cf005346d..9fac28659 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -8,4 +8,4 @@ registry.k8s.io/sig-storage/csi-provisioner:v4.0.1 registry.k8s.io/sig-storage/csi-resizer:v1.10.1 registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2 - rook/ceph:v1.14.6 + rook/ceph:v1.14.7 diff --git a/deploy/examples/multus-validation.yaml b/deploy/examples/multus-validation.yaml index 2ebf33577..ab72c4a73 100644 --- a/deploy/examples/multus-validation.yaml +++ b/deploy/examples/multus-validation.yaml @@ -101,7 +101,7 @@ spec: serviceAccountName: rook-ceph-multus-validation containers: - name: multus-validation - image: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 command: ["rook"] args: - "multus" diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index b8186c413..3a2db6a61 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -667,7 +667,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 6f980519d..3b5def43c 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -591,7 +591,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index a529d5411..3572e61f7 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: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 # 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 51b5c8d36..6c567f33c 100644 --- a/deploy/examples/toolbox-job.yaml +++ b/deploy/examples/toolbox-job.yaml @@ -10,7 +10,7 @@ spec: spec: initContainers: - name: config-init - image: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 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: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/deploy/examples/toolbox-operator-image.yaml b/deploy/examples/toolbox-operator-image.yaml index a07f674b2..686253b1d 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: rook/ceph:v1.14.6 + image: rook/ceph:v1.14.7 command: - /bin/bash - -c