From dd0401e71100076c566b85317cfdfe1ee07a364d Mon Sep 17 00:00:00 2001 From: travisn Date: Tue, 1 Aug 2023 14:33:24 -0600 Subject: [PATCH] build: update release version to v1.12.1 For the patch release update the examples and docs Signed-off-by: travisn --- Documentation/Getting-Started/quickstart.md | 2 +- .../Monitoring/ceph-monitoring.md | 2 +- Documentation/Upgrade/rook-upgrade.md | 32 +++++++++---------- 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 +-- .../installer/ceph_manifests_previous.go | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index 0f5a1f8d7..83cd6872c 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.12.0 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.12.1 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 bc564e632..fd03a7af2 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.12.0 https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.12.1 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 f25a717c5..ac0adf350 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -116,8 +116,8 @@ 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.11.7` to -the version `v1.12.0`. This upgrade should work from any official patch release of Rook v1.11 to any +The examples given in this guide upgrade a live Rook cluster running `v1.11.10` to +the version `v1.12.1`. This upgrade should work from any official patch release of Rook v1.11 to any official patch release of v1.12. Let's get started! @@ -144,7 +144,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.12.0 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.12.1 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -183,7 +183,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.12.0 +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.12.1 ``` ### **3. Update Ceph CSI** @@ -213,18 +213,18 @@ 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.12.0`, the Ceph cluster's core components are fully updated. +availability and `rook-version=v1.12.1`, 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.12.0 -rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.12.0 -rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.12.0 -rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.12.0 -rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.12.0 -rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.11.7 -rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.11.7 +rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.12.1 +rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.12.1 +rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.12.1 +rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.12.1 +rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.12.1 +rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.11.10 +rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.11.10 ``` An easy check to see if the upgrade is totally finished is to check that there is only one @@ -233,14 +233,14 @@ An easy check to see if the upgrade is totally finished is to check that there i ```console # 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.11.7 - rook-version=v1.12.0 + rook-version=v1.11.10 + rook-version=v1.12.1 This cluster is finished: - rook-version=v1.12.0 + rook-version=v1.12.1 ``` ### **5. Verify the updated cluster** -At this point, the Rook operator should be running version `rook/ceph:v1.12.0`. +At this point, the Rook operator should be running version `rook/ceph:v1.12.1`. 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 83fb780aa..71c1a72b7 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.12.0 + image: rook/ceph:v1.12.1 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 fc3f68f2d..b82399722 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -8,4 +8,4 @@ registry.k8s.io/sig-storage/csi-provisioner:v3.5.0 registry.k8s.io/sig-storage/csi-resizer:v1.8.0 registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2 - rook/ceph:v1.12.0 + rook/ceph:v1.12.1 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index 0ace471c0..2f8346d0d 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -636,7 +636,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.12.0 + image: rook/ceph:v1.12.1 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index d58578f21..d0a6bcdb2 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -562,7 +562,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:v1.12.0 + image: rook/ceph:v1.12.1 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index cd12537bd..28c84d98c 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.12.0 + image: rook/ceph:v1.12.1 # 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 71562c468..47f0ec2b8 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.12.0 + image: rook/ceph:v1.12.1 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.12.0 + image: rook/ceph:v1.12.1 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/tests/framework/installer/ceph_manifests_previous.go b/tests/framework/installer/ceph_manifests_previous.go index 895a512fc..51ac22c63 100644 --- a/tests/framework/installer/ceph_manifests_previous.go +++ b/tests/framework/installer/ceph_manifests_previous.go @@ -24,7 +24,7 @@ import ( const ( // The version from which the upgrade test will start - Version1_11 = "v1.11.7" + Version1_11 = "v1.11.10" ) // CephManifestsPreviousVersion wraps rook yaml definitions