diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index 1fc735fd88eb..3e94fc3ab32e 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.13.1 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.13.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/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md b/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md index 750dea9c72a7..bb654b8aa4b2 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.13.1 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.13.2 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 06ab0fdf199c..4bc3c65dd7e4 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -78,11 +78,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.13.1 is released, the process of updating from v1.13.0 is as simple as running +example, when Rook v1.13.2 is released, the process of updating from v1.13.0 is as simple as running the following: ```console -git clone --single-branch --depth=1 --branch v1.13.1 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.13.2 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -94,7 +94,7 @@ Then, apply the latest changes from v1.13, 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.13.1 +kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.13.2 ``` As exemplified above, it is a good practice to update Rook common resources from the example @@ -129,7 +129,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.12.10` to -the version `v1.13.1`. This upgrade should work from any official patch release of Rook v1.12 to any +the version `v1.13.2`. This upgrade should work from any official patch release of Rook v1.12 to any official patch release of v1.13. Let's get started! @@ -156,7 +156,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.13.1 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.13.2 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -195,7 +195,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.13.1 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.13.2 ``` ### **3. Update Ceph CSI** @@ -225,16 +225,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.13.1`, the Ceph cluster's core components are fully updated. +availability and `rook-version=v1.13.2`, 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.13.1 -rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.13.1 -rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.13.1 -rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.13.1 -rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.13.1 +rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.13.2 +rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.13.2 +rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.13.2 +rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.13.2 +rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.13.2 rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.12.10 rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.12.10 ``` @@ -246,13 +246,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.12.10 - rook-version=v1.13.1 + rook-version=v1.13.2 This cluster is finished: - rook-version=v1.13.1 + rook-version=v1.13.2 ``` ### **5. Verify the updated cluster** -At this point, the Rook operator should be running version `rook/ceph:v1.13.1`. +At this point, the Rook operator should be running version `rook/ceph:v1.13.2`. Verify the CephCluster health using the [health verification doc](health-verification.md). diff --git a/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index 6cc56827bd0f..8cd9bcab1c08 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.13.1 + image: rook/ceph:v1.13.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 63d10c8be30b..14b3705fd30d 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -8,4 +8,4 @@ registry.k8s.io/sig-storage/csi-provisioner:v3.6.2 registry.k8s.io/sig-storage/csi-resizer:v1.9.2 registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 - rook/ceph:v1.13.1 + rook/ceph:v1.13.2 diff --git a/deploy/examples/multus-validation.yaml b/deploy/examples/multus-validation.yaml index 7181fbd19b6e..2a372cfd7c6d 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.13.1 + image: rook/ceph:v1.13.2 command: ["rook"] args: - "multus" diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index 0d2f912fb3df..44c6f6fce534 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -672,7 +672,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.13.1 + image: rook/ceph:v1.13.2 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 94169106693d..9c9204cb7b9e 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -598,7 +598,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.13.1 + image: rook/ceph:v1.13.2 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index f5fd57942b6d..0c97eea5f11e 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.13.1 + image: rook/ceph:v1.13.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 e5778b132205..6705da41caf2 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.13.1 + image: rook/ceph:v1.13.2 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.13.1 + image: rook/ceph:v1.13.2 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/deploy/examples/toolbox-operator-image.yaml b/deploy/examples/toolbox-operator-image.yaml index 07fc123d8bd5..851173257a18 100644 --- a/deploy/examples/toolbox-operator-image.yaml +++ b/deploy/examples/toolbox-operator-image.yaml @@ -24,7 +24,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-ceph-tools-operator-image - image: rook/ceph:v1.13.1 + image: rook/ceph:v1.13.2 command: - /bin/bash - -c