From 1b7267cc28d19baa4e31cfa76234e0ec86644d3c Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 25 Nov 2024 12:15:15 -0700 Subject: [PATCH] build: set the release version to v1.16.0-beta.0 For the new 1.16 branch and first test release, update the docs and manifests to v1.16.0-beta.0 Signed-off-by: Travis Nielsen --- Documentation/Getting-Started/quickstart.md | 2 +- .../Storage-Configuration/Monitoring/ceph-monitoring.md | 2 +- Documentation/Upgrade/rook-upgrade.md | 4 ++-- deploy/charts/rook-ceph/values.yaml | 2 +- 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 ++-- deploy/examples/toolbox-operator-image.yaml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Documentation/Getting-Started/quickstart.md b/Documentation/Getting-Started/quickstart.md index f7b732cc43e0..18a104936ea8 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 master https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.16.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 40098c724f5b..bcb67c3755c3 100644 --- a/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md +++ b/Documentation/Storage-Configuration/Monitoring/ceph-monitoring.md @@ -48,7 +48,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.16.0-beta.0 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 9d6bc6e6bdad..708f8fef7c68 100644 --- a/Documentation/Upgrade/rook-upgrade.md +++ b/Documentation/Upgrade/rook-upgrade.md @@ -148,7 +148,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.16.0-beta.0 https://github.com/rook/rook.git cd rook/deploy/examples ``` @@ -187,7 +187,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.16.0-beta.0 ``` ### **3. Update Ceph CSI** diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index c6bdda1f7238..e14c761da08c 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -7,7 +7,7 @@ image: repository: docker.io/rook/ceph # -- Image tag # @default -- `master` - tag: master + tag: v1.16.0-beta.0 # -- Image pull policy pullPolicy: IfNotPresent diff --git a/deploy/examples/direct-mount.yaml b/deploy/examples/direct-mount.yaml index ff9ebbea261f..3ac64a711d76 100644 --- a/deploy/examples/direct-mount.yaml +++ b/deploy/examples/direct-mount.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: rook-ceph-default containers: - name: rook-direct-mount - image: docker.io/rook/ceph:master + image: docker.io/rook/ceph:v1.16.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 d8c62fdfef73..15e6f7c0a749 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -1,4 +1,4 @@ - docker.io/rook/ceph:master + docker.io/rook/ceph:v1.16.0-beta.0 gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 quay.io/ceph/ceph:v18.2.4 quay.io/ceph/cosi:v0.1.2 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index 23d69fb09564..100743e9d22d 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -671,7 +671,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: docker.io/rook/ceph:master + image: docker.io/rook/ceph:v1.16.0-beta.0 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 75d92b585afc..93dce9d9c8de 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -600,7 +600,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: docker.io/rook/ceph:master + image: docker.io/rook/ceph:v1.16.0-beta.0 args: ["ceph", "operator"] securityContext: runAsNonRoot: true diff --git a/deploy/examples/osd-purge.yaml b/deploy/examples/osd-purge.yaml index 5d4b594093f6..98da2ec1c7cb 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: docker.io/rook/ceph:master + image: docker.io/rook/ceph:v1.16.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 a6864f59641f..c1f28b882200 100644 --- a/deploy/examples/toolbox-job.yaml +++ b/deploy/examples/toolbox-job.yaml @@ -10,7 +10,7 @@ spec: spec: initContainers: - name: config-init - image: docker.io/rook/ceph:master + image: docker.io/rook/ceph:v1.16.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: docker.io/rook/ceph:master + image: docker.io/rook/ceph:v1.16.0-beta.0 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/deploy/examples/toolbox-operator-image.yaml b/deploy/examples/toolbox-operator-image.yaml index 9b7ddf13fec5..5b0736f4277c 100644 --- a/deploy/examples/toolbox-operator-image.yaml +++ b/deploy/examples/toolbox-operator-image.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: rook-ceph-default containers: - name: rook-ceph-tools-operator-image - image: docker.io/rook/ceph:master + image: docker.io/rook/ceph:v1.16.0-beta.0 command: - /bin/bash - -c