diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index 1ead275f10d0..7174a9daa733 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -86,7 +86,7 @@ jobs: sed -i 's//1/' deploy/examples/osd-purge.yaml # the CI must force the deletion since we use replica 1 on 2 OSDs sed -i 's/false/true/' deploy/examples/osd-purge.yaml - sed -i 's|rook/ceph:v1.8.1|rook/ceph:local-build|' deploy/examples/osd-purge.yaml + sed -i 's|rook/ceph:v1.8.2|rook/ceph:local-build|' deploy/examples/osd-purge.yaml kubectl -n rook-ceph create -f deploy/examples/osd-purge.yaml toolbox=$(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[*].metadata.name}') kubectl -n rook-ceph exec $toolbox -- ceph status diff --git a/Documentation/ceph-monitoring.md b/Documentation/ceph-monitoring.md index a16fb2f1508a..48fde258afc7 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.8.1 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.8.2 https://github.com/rook/rook.git cd rook/deploy/examples/monitoring ``` diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index 36fe5baf5685..ae83f6e40aa7 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -71,12 +71,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.8.1 is released, the process of updating from v1.8.0 is as simple as running +example, when Rook v1.8.2 is released, the process of updating from v1.8.0 is as simple as running the following: First get the latest common resources manifests that contain the latest changes for Rook v1.8. ```sh -git clone --single-branch --depth=1 --branch v1.8.1 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.8.2 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -87,7 +87,7 @@ section for instructions on how to change the default namespaces in `common.yaml Then apply the latest changes from v1.8 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.8.1 +kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.8.2 ``` As exemplified above, it is a good practice to update Rook-Ceph common resources from the example @@ -266,7 +266,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.7.8` to -the version `v1.8.1`. This upgrade should work from any official patch release of Rook v1.7 to any +the version `v1.8.2`. This upgrade should work from any official patch release of Rook v1.7 to any official patch release of v1.8. **Rook release from `master` are expressly unsupported.** It is strongly recommended that you use @@ -291,7 +291,7 @@ by the Operator. Also update the Custom Resource Definitions (CRDs). Get the latest common resources manifests that contain the latest changes. ```sh -git clone --single-branch --depth=1 --branch v1.8.1 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.8.2 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -343,7 +343,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.8.1 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.8.2 ``` #### Admission controller @@ -377,16 +377,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.8.1`, the Ceph cluster's core components are fully updated. +availability and `rook-version=v1.8.2`, 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.8.1 ->rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.8.1 ->rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.8.1 ->rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.8.1 ->rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.8.1 +>rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.8.2 +>rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.8.2 +>rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.8.2 +>rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.8.2 +>rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.8.2 >rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.7.8 >rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.7.8 >``` @@ -398,14 +398,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.7.8 - rook-version=v1.8.1 + rook-version=v1.8.2 This cluster is finished: - rook-version=v1.8.1 + rook-version=v1.8.2 ``` ### **5. Verify the updated cluster** -At this point, your Rook operator should be running version `rook/ceph:v1.8.1`. +At this point, your Rook operator should be running version `rook/ceph:v1.8.2`. Verify the Ceph cluster's health using the [health verification section](#health-verification). diff --git a/Documentation/quickstart.md b/Documentation/quickstart.md index 21f2fc7ebc85..aee8b046fdda 100644 --- a/Documentation/quickstart.md +++ b/Documentation/quickstart.md @@ -34,7 +34,7 @@ In order to configure the Ceph storage cluster, at least one of these local stor A simple Rook cluster can be created with the following kubectl commands and [example manifests](https://github.com/rook/rook/blob/{{ branchName }}/deploy/examples). ```console -$ git clone --single-branch --branch v1.8.1 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.8.2 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/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index f8bf3316b126..daa32229d0b6 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.8.1 + image: rook/ceph:v1.8.2 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 adf83cd30bdc..fe291c5a0ac2 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -6,4 +6,4 @@ quay.io/ceph/ceph:v16.2.7 quay.io/cephcsi/cephcsi:v3.4.0 quay.io/csiaddons/volumereplication-operator:v0.1.0 - rook/ceph:v1.8.1 + rook/ceph:v1.8.2 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index 9f215b54ac56..4b51cca368a2 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -445,7 +445,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.8.1 + image: rook/ceph:v1.8.2 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 792234242705..fdff42141cee 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -362,7 +362,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.8.1 + image: rook/ceph:v1.8.2 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index 24f6ae7710e2..64fe8b2dc508 100644 --- a/deploy/examples/osd-purge.yaml +++ b/deploy/examples/osd-purge.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: rook-ceph-purge-osd containers: - name: osd-removal - image: rook/ceph:v1.8.1 + image: rook/ceph:v1.8.2 # 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 755cac8b6bbe..1e6b97b05677 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.8.1 + image: rook/ceph:v1.8.2 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.8.1 + image: rook/ceph:v1.8.2 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/deploy/examples/toolbox.yaml b/deploy/examples/toolbox.yaml index fab9b74dd75c..fe5a56071a9b 100644 --- a/deploy/examples/toolbox.yaml +++ b/deploy/examples/toolbox.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-ceph-tools - image: rook/ceph:v1.8.1 + image: rook/ceph:v1.8.2 command: ["/bin/bash"] args: ["-m", "-c", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent