From 3ab900a6457fd27bac1f09aa70bc04a63740b280 Mon Sep 17 00:00:00 2001 From: travisn Date: Thu, 14 Sep 2023 15:58:59 -0600 Subject: [PATCH] build: update the release version to v1.11.11 For the patch release, update the docs and examples to v1.11.11 Signed-off-by: travisn --- Documentation/Getting-Started/quickstart.md | 2 +- .../Monitoring/ceph-monitoring.md | 2 +- Documentation/Upgrade/rook-upgrade.md | 30 +++++++++---------- 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 +-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index c448f17d5..27eb0a9f1 100644 --- a/Documentation/Getting-Started/quickstart.md +++ b/Documentation/Getting-Started/quickstart.md @@ -34,7 +34,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.11.10 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.11.11 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 17873b538..1f6d7df9e 100644 --- a/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md +++ b/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md @@ -44,7 +44,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.11.10 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.11.11 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 15ca64c92..10acbf3b8 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -63,11 +63,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.11.10 is released, the process of updating from v1.11.0 is as simple as running +example, when Rook v1.11.11 is released, the process of updating from v1.11.0 is as simple as running the following: ```console -git clone --single-branch --depth=1 --branch v1.11.10 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.11.11 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -79,7 +79,7 @@ Then apply the latest changes from v1.11 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.11.10 +kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.11.11 ``` As exemplified above, it is a good practice to update Rook common resources from the example @@ -112,7 +112,7 @@ In order to successfully upgrade a Rook cluster, the following prerequisites mus ## Rook Operator Upgrade In the examples given in this guide, we will be upgrading a live Rook cluster running `v1.10.13` to -the version `v1.11.10`. This upgrade should work from any official patch release of Rook v1.10 to any +the version `v1.11.11`. This upgrade should work from any official patch release of Rook v1.10 to any official patch release of v1.11. Let's get started! @@ -140,7 +140,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.11.10 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.11.11 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -179,7 +179,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.11.10 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.11.11 ``` ### **3. Update Ceph CSI** @@ -209,16 +209,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.11.10`, the Ceph cluster's core components are fully updated. +availability and `rook-version=v1.11.11`, 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.11.10 -rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.11.10 -rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.11.10 -rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.11.10 -rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.11.10 +rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.11.11 +rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.11.11 +rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.11.11 +rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.11.11 +rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.11.11 rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.10.13 rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.10.13 ``` @@ -230,13 +230,13 @@ 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.10.13 - rook-version=v1.11.10 + rook-version=v1.11.11 This cluster is finished: - rook-version=v1.11.10 + rook-version=v1.11.11 ``` ### **5. Verify the updated cluster** -At this point, your Rook operator should be running version `rook/ceph:v1.11.10`. +At this point, your Rook operator should be running version `rook/ceph:v1.11.11`. Verify the Ceph cluster's health using the [health verification doc](health-verification.md). diff --git a/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index 5678edfd1..282d7c512 100644 --- a/deploy/examples/direct-mount.yaml +++ b/deploy/examples/direct-mount.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-direct-mount - image: rook/ceph:v1.11.10 + image: rook/ceph:v1.11.11 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 f95202482..75bfbfdc1 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -6,4 +6,4 @@ registry.k8s.io/sig-storage/csi-provisioner:v3.4.0 registry.k8s.io/sig-storage/csi-resizer:v1.7.0 registry.k8s.io/sig-storage/csi-snapshotter:v6.2.1 - rook/ceph:v1.11.10 + rook/ceph:v1.11.11 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index a7d224c8f..c1c176eb1 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -633,7 +633,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.11.10 + image: rook/ceph:v1.11.11 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 9316cd98d..964a5b579 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -560,7 +560,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.11.10 + image: rook/ceph:v1.11.11 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index cbf03041a..f8923a04c 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.11.10 + image: rook/ceph:v1.11.11 # 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 0ff537603..c3d6fb947 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.11.10 + image: rook/ceph:v1.11.11 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.11.10 + image: rook/ceph:v1.11.11 volumeMounts: - mountPath: /etc/ceph name: ceph-config