diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index 1d1134776..e5eae6d36 100644 --- a/Documentation/Getting-Started/quickstart.md +++ b/Documentation/Getting-Started/quickstart.md @@ -35,7 +35,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/master/deploy/examples). ```console -$ git clone --single-branch --branch master https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.11.0-beta.0 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 71e7ca128..7864f6eb1 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 master https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.11.0-beta.0 https://github.com/rook/rook.git cd rook/deploy/examples/monitoring ``` @@ -105,9 +105,9 @@ A guide to how you can write your own Prometheus consoles can be found on the of To enable the Ceph Prometheus alerts via the helm charts, set the following properties in values.yaml: -* rook-ceph chart: +- rook-ceph chart: `monitoring.enabled: true` -* rook-ceph-cluster chart: +- rook-ceph-cluster chart: `monitoring.enabled: true` `monitoring.createPrometheusRules: true` diff --git a/Documentation/Upgrade/rook-upgrade.md b/Documentation/Upgrade/rook-upgrade.md index f9a70e543..0b4a42415 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -75,7 +75,7 @@ example, when Rook v1.10.1 is released, the process of updating from v1.10.0 is the following: ```console -git clone --single-branch --depth=1 --branch v1.10.1 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.11.1 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -116,7 +116,6 @@ In order to successfully upgrade a Rook cluster, the following prerequisites mus starting state. * All pods consuming Rook storage should be created, running, and in a steady state. - ## Rook Operator Upgrade In the examples given in this guide, we will be upgrading a live Rook cluster running `v1.9.10` to @@ -148,7 +147,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 master https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.11.0-beta.0 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -187,7 +186,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:master +kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.11.0-beta.0 ``` ### **3. Update Ceph CSI** diff --git a/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index db4487eb5..98fcc7858 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:master + image: rook/ceph:v1.11.0-beta.0 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 d94699fbe..38e8045dc 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -6,4 +6,4 @@ registry.k8s.io/sig-storage/csi-provisioner:v3.4.0 registry.k8s.io/sig-storage/csi-resizer:v1.7.0 registry.k8s.io/sig-storage/csi-snapshotter:v6.2.1 - rook/ceph:master + rook/ceph:v1.11.0-beta.0 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index cb08f0546..bc162de2d 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -604,7 +604,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:master + image: rook/ceph:v1.11.0-beta.0 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 6880c65ae..49c7f55b8 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -531,7 +531,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:master + image: rook/ceph:v1.11.0-beta.0 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index f7915180d..d7aeb3578 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:master + image: rook/ceph:v1.11.0-beta.0 # 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 940cb9866..0e1b013b1 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:master + image: rook/ceph:v1.11.0-beta.0 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:master + image: rook/ceph:v1.11.0-beta.0 volumeMounts: - mountPath: /etc/ceph name: ceph-config