Skip to content

Commit

Permalink
Merge pull request #13813 from travisn/release-1.13.5
Browse files Browse the repository at this point in the history
build: Update the release version to v1.13.5
  • Loading branch information
travisn committed Feb 22, 2024
2 parents 4f254e1 + 95f950e commit b09a653
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Documentation/Getting-Started/quickstart.md
Expand Up @@ -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.4 https://github.com/rook/rook.git
$ git clone --single-branch --branch v1.13.5 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
Expand Down
Expand Up @@ -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.4 https://github.com/rook/rook.git
$ git clone --single-branch --branch v1.13.5 https://github.com/rook/rook.git
cd rook/deploy/examples/monitoring
```

Expand Down
30 changes: 15 additions & 15 deletions Documentation/Upgrade/rook-upgrade.md
Expand Up @@ -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.4 is released, the process of updating from v1.13.0 is as simple as running
example, when Rook v1.13.5 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.4 https://github.com/rook/rook.git
git clone --single-branch --depth=1 --branch v1.13.5 https://github.com/rook/rook.git
cd rook/deploy/examples
```

Expand All @@ -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.4
kubectl -n rook-ceph set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.13.5
```

As exemplified above, it is a good practice to update Rook common resources from the example
Expand Down Expand Up @@ -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.11` to
the version `v1.13.4`. This upgrade should work from any official patch release of Rook v1.12 to any
the version `v1.13.5`. 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!
Expand All @@ -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.4 https://github.com/rook/rook.git
git clone --single-branch --depth=1 --branch v1.13.5 https://github.com/rook/rook.git
cd rook/deploy/examples
```

Expand Down Expand Up @@ -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.4
kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.13.5
```

### **3. Update Ceph CSI**
Expand Down Expand Up @@ -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.4`, the Ceph cluster's core components are fully updated.
availability and `rook-version=v1.13.5`, 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.4
rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.13.4
rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.13.4
rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.13.4
rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.13.4
rook-ceph-mgr-a req/upd/avl: 1/1/1 rook-version=v1.13.5
rook-ceph-mon-a req/upd/avl: 1/1/1 rook-version=v1.13.5
rook-ceph-mon-b req/upd/avl: 1/1/1 rook-version=v1.13.5
rook-ceph-mon-c req/upd/avl: 1/1/1 rook-version=v1.13.5
rook-ceph-osd-0 req/upd/avl: 1// rook-version=v1.13.5
rook-ceph-osd-1 req/upd/avl: 1/1/1 rook-version=v1.12.11
rook-ceph-osd-2 req/upd/avl: 1/1/1 rook-version=v1.12.11
```
Expand All @@ -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.11
rook-version=v1.13.4
rook-version=v1.13.5
This cluster is finished:
rook-version=v1.13.4
rook-version=v1.13.5
```

### **5. Verify the updated cluster**

At this point, the Rook operator should be running version `rook/ceph:v1.13.4`.
At this point, the Rook operator should be running version `rook/ceph:v1.13.5`.

Verify the CephCluster health using the [health verification doc](health-verification.md).
2 changes: 1 addition & 1 deletion deploy/examples/direct-mount.yaml
Expand Up @@ -18,7 +18,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: rook-direct-mount
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.5
command: ["/bin/bash"]
args: ["-m", "-c", "/usr/local/bin/toolbox.sh"]
imagePullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/images.txt
Expand Up @@ -8,4 +8,4 @@
registry.k8s.io/sig-storage/csi-provisioner:v3.6.3
registry.k8s.io/sig-storage/csi-resizer:v1.9.2
registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
rook/ceph:v1.13.4
rook/ceph:v1.13.5
2 changes: 1 addition & 1 deletion deploy/examples/multus-validation.yaml
Expand Up @@ -101,7 +101,7 @@ spec:
serviceAccountName: rook-ceph-multus-validation
containers:
- name: multus-validation
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.5
command: ["rook"]
args:
- "multus"
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/operator-openshift.yaml
Expand Up @@ -663,7 +663,7 @@ spec:
serviceAccountName: rook-ceph-system
containers:
- name: rook-ceph-operator
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.5
args: ["ceph", "operator"]
securityContext:
runAsNonRoot: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/operator.yaml
Expand Up @@ -588,7 +588,7 @@ spec:
serviceAccountName: rook-ceph-system
containers:
- name: rook-ceph-operator
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.5
args: ["ceph", "operator"]
securityContext:
runAsNonRoot: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/osd-purge.yaml
Expand Up @@ -28,7 +28,7 @@ spec:
serviceAccountName: rook-ceph-purge-osd
containers:
- name: osd-removal
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.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`.
Expand Down
4 changes: 2 additions & 2 deletions deploy/examples/toolbox-job.yaml
Expand Up @@ -10,7 +10,7 @@ spec:
spec:
initContainers:
- name: config-init
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.5
command: ["/usr/local/bin/toolbox.sh"]
args: ["--skip-watch"]
imagePullPolicy: IfNotPresent
Expand All @@ -29,7 +29,7 @@ spec:
mountPath: /var/lib/rook-ceph-mon
containers:
- name: script
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.5
volumeMounts:
- mountPath: /etc/ceph
name: ceph-config
Expand Down
2 changes: 1 addition & 1 deletion deploy/examples/toolbox-operator-image.yaml
Expand Up @@ -24,7 +24,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: rook-ceph-tools-operator-image
image: rook/ceph:v1.13.4
image: rook/ceph:v1.13.5
command:
- /bin/bash
- -c
Expand Down

0 comments on commit b09a653

Please sign in to comment.