From 78e6e4bc3399439e957a28572476e15312d21f47 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 7 Oct 2021 15:06:57 -0600 Subject: [PATCH] build: update the patch version to v1.7.5 The example manifests and documentation is updated to v1.7.5 Signed-off-by: Travis Nielsen --- Documentation/ceph-monitoring.md | 2 +- Documentation/ceph-toolbox.md | 6 ++-- Documentation/ceph-upgrade.md | 30 +++++++++---------- .../kubernetes/ceph/direct-mount.yaml | 2 +- cluster/examples/kubernetes/ceph/images.txt | 2 +- .../kubernetes/ceph/operator-openshift.yaml | 2 +- .../examples/kubernetes/ceph/operator.yaml | 2 +- .../examples/kubernetes/ceph/osd-purge.yaml | 2 +- .../examples/kubernetes/ceph/toolbox-job.yaml | 4 +-- cluster/examples/kubernetes/ceph/toolbox.yaml | 2 +- tests/scripts/github-action-helper.sh | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Documentation/ceph-monitoring.md b/Documentation/ceph-monitoring.md index 83593fc99fd8..1ecd49b4f256 100644 --- a/Documentation/ceph-monitoring.md +++ b/Documentation/ceph-monitoring.md @@ -38,7 +38,7 @@ With the Prometheus operator running, we can create a service monitor that will From the root of your locally cloned Rook repo, go the monitoring directory: ```console -$ git clone --single-branch --branch v1.7.4 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.7.5 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/ceph/monitoring ``` diff --git a/Documentation/ceph-toolbox.md b/Documentation/ceph-toolbox.md index 878823c32a8a..32ea0ae712c3 100644 --- a/Documentation/ceph-toolbox.md +++ b/Documentation/ceph-toolbox.md @@ -43,7 +43,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-ceph-tools - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 command: ["/tini"] args: ["-g", "--", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent @@ -133,7 +133,7 @@ spec: spec: initContainers: - name: config-init - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 command: ["/usr/local/bin/toolbox.sh"] args: ["--skip-watch"] imagePullPolicy: IfNotPresent @@ -155,7 +155,7 @@ spec: mountPath: /etc/rook containers: - name: script - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index 04986b16978d..e39c129e6ea7 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -53,12 +53,12 @@ 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.7.4 is released, the process of updating from v1.7.0 is as simple as running +example, when Rook v1.7.5 is released, the process of updating from v1.7.0 is as simple as running the following: First get the latest common resources manifests that contain the latest changes for Rook v1.7. ```sh -git clone --single-branch --depth=1 --branch v1.7.4 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.7.5 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/ceph ``` @@ -75,7 +75,7 @@ section for instructions on how to change the default namespaces in `common.yaml Then apply the latest changes from v1.7 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.7.4 +kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.7.5 ``` As exemplified above, it is a good practice to update Rook-Ceph common resources from the example @@ -261,7 +261,7 @@ Any pod that is using a Rook volume should also remain healthy: ## Rook Operator Upgrade Process In the examples given in this guide, we will be upgrading a live Rook cluster running `v1.6.8` to -the version `v1.7.4`. This upgrade should work from any official patch release of Rook v1.6 to any +the version `v1.7.5`. This upgrade should work from any official patch release of Rook v1.6 to any official patch release of v1.7. **Rook release from `master` are expressly unsupported.** It is strongly recommended that you use @@ -291,7 +291,7 @@ needed by the Operator. Also update the Custom Resource Definitions (CRDs). First get the latest common resources manifests that contain the latest changes. ```sh -git clone --single-branch --depth=1 --branch v1.7.4 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.7.5 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/ceph ``` @@ -337,7 +337,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. ```sh -kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.7.4 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.7.5 ``` ### **4. Wait for the upgrade to complete** @@ -353,16 +353,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.7.4`, the Ceph cluster's core components are fully updated. +availability and `rook-version=v1.7.5`, the Ceph cluster's core components are fully updated. >``` >Every 2.0s: kubectl -n rook-ceph get deployment -o j... > ->rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.7.4 ->rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.7.4 ->rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.7.4 ->rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.7.4 ->rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.7.4 +>rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.7.5 +>rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.7.5 +>rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.7.5 +>rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.7.5 +>rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.7.5 >rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.6.8 >rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.6.8 >``` @@ -374,14 +374,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.6.8 - rook-version=v1.7.4 + rook-version=v1.7.5 This cluster is finished: - rook-version=v1.7.4 + rook-version=v1.7.5 ``` ### **5. Verify the updated cluster** -At this point, your Rook operator should be running version `rook/ceph:v1.7.4`. +At this point, your Rook operator should be running version `rook/ceph:v1.7.5`. Verify the Ceph cluster's health using the [health verification section](#health-verification). diff --git a/cluster/examples/kubernetes/ceph/direct-mount.yaml b/cluster/examples/kubernetes/ceph/direct-mount.yaml index 09193d9621c5..5dbfbc91a264 100644 --- a/cluster/examples/kubernetes/ceph/direct-mount.yaml +++ b/cluster/examples/kubernetes/ceph/direct-mount.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-direct-mount - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 command: ["/tini"] args: ["-g", "--", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent diff --git a/cluster/examples/kubernetes/ceph/images.txt b/cluster/examples/kubernetes/ceph/images.txt index 41f96c790b5c..d149da14c20e 100644 --- a/cluster/examples/kubernetes/ceph/images.txt +++ b/cluster/examples/kubernetes/ceph/images.txt @@ -6,4 +6,4 @@ quay.io/ceph/ceph:v16.2.6 quay.io/cephcsi/cephcsi:v3.4.0 quay.io/csiaddons/volumereplication-operator:v0.1.0 - rook/ceph:v1.7.4 + rook/ceph:v1.7.5 diff --git a/cluster/examples/kubernetes/ceph/operator-openshift.yaml b/cluster/examples/kubernetes/ceph/operator-openshift.yaml index d2a847291eb3..6c85e08f0da2 100644 --- a/cluster/examples/kubernetes/ceph/operator-openshift.yaml +++ b/cluster/examples/kubernetes/ceph/operator-openshift.yaml @@ -446,7 +446,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 args: ["ceph", "operator"] volumeMounts: - mountPath: /var/lib/rook diff --git a/cluster/examples/kubernetes/ceph/operator.yaml b/cluster/examples/kubernetes/ceph/operator.yaml index b51a4006f8b3..e65543ede3a7 100644 --- a/cluster/examples/kubernetes/ceph/operator.yaml +++ b/cluster/examples/kubernetes/ceph/operator.yaml @@ -369,7 +369,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 args: ["ceph", "operator"] volumeMounts: - mountPath: /var/lib/rook diff --git a/cluster/examples/kubernetes/ceph/osd-purge.yaml b/cluster/examples/kubernetes/ceph/osd-purge.yaml index 279cfcde8fec..3e2ddae4715f 100644 --- a/cluster/examples/kubernetes/ceph/osd-purge.yaml +++ b/cluster/examples/kubernetes/ceph/osd-purge.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: rook-ceph-purge-osd containers: - name: osd-removal - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 # 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/cluster/examples/kubernetes/ceph/toolbox-job.yaml b/cluster/examples/kubernetes/ceph/toolbox-job.yaml index 9c1b11a89c3c..06d8fd41df12 100644 --- a/cluster/examples/kubernetes/ceph/toolbox-job.yaml +++ b/cluster/examples/kubernetes/ceph/toolbox-job.yaml @@ -10,7 +10,7 @@ spec: spec: initContainers: - name: config-init - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 command: ["/usr/local/bin/toolbox.sh"] args: ["--skip-watch"] imagePullPolicy: IfNotPresent @@ -32,7 +32,7 @@ spec: mountPath: /etc/rook containers: - name: script - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/cluster/examples/kubernetes/ceph/toolbox.yaml b/cluster/examples/kubernetes/ceph/toolbox.yaml index 50bbed9a176d..51e897bba16c 100644 --- a/cluster/examples/kubernetes/ceph/toolbox.yaml +++ b/cluster/examples/kubernetes/ceph/toolbox.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-ceph-tools - image: rook/ceph:v1.7.4 + image: rook/ceph:v1.7.5 command: ["/tini"] args: ["-g", "--", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index b5d33a01358a..e66d5a24d193 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -149,7 +149,7 @@ function create_cluster_prerequisites() { } function deploy_manifest_with_local_build() { - sed -i "s|image: rook/ceph:v1.7.4|image: rook/ceph:local-build|g" $1 + sed -i "s|image: rook/ceph:v1.7.5|image: rook/ceph:local-build|g" $1 kubectl create -f $1 }