diff --git a/.github/workflows/integration-test-cassandra-suite.yaml b/.github/workflows/integration-test-cassandra-suite.yaml index e76e5f23c..b907a913f 100644 --- a/.github/workflows/integration-test-cassandra-suite.yaml +++ b/.github/workflows/integration-test-cassandra-suite.yaml @@ -43,7 +43,7 @@ jobs: # set VERSION to a dummy value since Jenkins normally sets it for us. Do this to make Helm happy and not fail with "Error: Invalid Semantic Version" GOPATH=$(go env GOPATH) make clean && make -j$nproc IMAGES='cassandra' VERSION=0 build docker images - docker tag $(docker images|awk '/build-/ {print $1}') rook/cassandra:master + docker tag $(docker images|awk '/build-/ {print $1}') rook/cassandra:v1.7.0-beta.0 - name: TestCassandraSuite run: | diff --git a/.github/workflows/integration-test-nfs-suite.yaml b/.github/workflows/integration-test-nfs-suite.yaml index 70ef77ecf..6be1263a6 100644 --- a/.github/workflows/integration-test-nfs-suite.yaml +++ b/.github/workflows/integration-test-nfs-suite.yaml @@ -43,7 +43,7 @@ jobs: # set VERSION to a dummy value since Jenkins normally sets it for us. Do this to make Helm happy and not fail with "Error: Invalid Semantic Version" GOPATH=$(go env GOPATH) make clean && make -j$nproc IMAGES='nfs' VERSION=0 build docker images - docker tag $(docker images|awk '/build-/ {print $1}') rook/nfs:master + docker tag $(docker images|awk '/build-/ {print $1}') rook/nfs:v1.7.0-beta.0 - name: install nfs-common run: | diff --git a/.github/workflows/integration-tests-on-release.yaml b/.github/workflows/integration-tests-on-release.yaml index 7b7ff04f2..5787f7bd3 100644 --- a/.github/workflows/integration-tests-on-release.yaml +++ b/.github/workflows/integration-tests-on-release.yaml @@ -301,7 +301,7 @@ jobs: # set VERSION to a dummy value since Jenkins normally sets it for us. Do this to make Helm happy and not fail with "Error: Invalid Semantic Version" GOPATH=$(go env GOPATH) make clean && make -j$nproc IMAGES='cassandra' VERSION=0 build docker images - docker tag $(docker images|awk '/build-/ {print $1}') rook/cassandra:master + docker tag $(docker images|awk '/build-/ {print $1}') rook/cassandra:v1.7.0-beta.0 - name: TestCassandraSuite run: | @@ -352,7 +352,7 @@ jobs: # set VERSION to a dummy value since Jenkins normally sets it for us. Do this to make Helm happy and not fail with "Error: Invalid Semantic Version" GOPATH=$(go env GOPATH) make clean && make -j$nproc IMAGES='nfs' VERSION=0 build docker images - docker tag $(docker images|awk '/build-/ {print $1}') rook/nfs:master + docker tag $(docker images|awk '/build-/ {print $1}') rook/nfs:v1.7.0-beta.0 - name: install nfs-common run: | diff --git a/Documentation/cassandra.md b/Documentation/cassandra.md index 91abe3112..7f0ae2ff0 100644 --- a/Documentation/cassandra.md +++ b/Documentation/cassandra.md @@ -21,7 +21,7 @@ To make sure you have a Kubernetes cluster that is ready for `Rook`, you can [fo First deploy the Rook Cassandra Operator using the following commands: ```console -$ git clone --single-branch --branch {{ branchName }} https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.7.0-beta.0 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/cassandra kubectl apply -f crds.yaml kubectl apply -f operator.yaml diff --git a/Documentation/ceph-monitoring.md b/Documentation/ceph-monitoring.md index 9e8cca274..6861d1b51 100644 --- a/Documentation/ceph-monitoring.md +++ b/Documentation/ceph-monitoring.md @@ -38,7 +38,7 @@ With the Prometheus operator running, we can create a service monitor that will From the root of your locally cloned Rook repo, go the monitoring directory: ```console -$ git clone --single-branch --branch {{ branchName }} https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.7.0-beta.0 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/ceph/monitoring ``` @@ -196,4 +196,4 @@ spec: labels: monitoring: prometheus: k8s -[...] \ No newline at end of file +[...] diff --git a/Documentation/ceph-quickstart.md b/Documentation/ceph-quickstart.md index 51fa217cb..8e04b7791 100644 --- a/Documentation/ceph-quickstart.md +++ b/Documentation/ceph-quickstart.md @@ -50,7 +50,7 @@ If the `FSTYPE` field is not empty, there is a filesystem on top of the correspo If you're feeling lucky, a simple Rook cluster can be created with the following kubectl commands and [example yaml files](https://github.com/rook/rook/blob/{{ branchName }}/cluster/examples/kubernetes/ceph). For the more detailed install, skip to the next section to [deploy the Rook operator](#deploy-the-rook-operator). ```console -$ git clone --single-branch --branch {{ branchName }} https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.7.0-beta.0 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/ceph kubectl create -f crds.yaml -f common.yaml -f operator.yaml kubectl create -f cluster.yaml diff --git a/Documentation/ceph-toolbox.md b/Documentation/ceph-toolbox.md index a6baed263..40e1f722f 100644 --- a/Documentation/ceph-toolbox.md +++ b/Documentation/ceph-toolbox.md @@ -43,7 +43,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-ceph-tools - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 command: ["/tini"] args: ["-g", "--", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent @@ -133,7 +133,7 @@ spec: spec: initContainers: - name: config-init - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 command: ["/usr/local/bin/toolbox.sh"] args: ["--skip-watch"] imagePullPolicy: IfNotPresent @@ -155,7 +155,7 @@ spec: mountPath: /etc/rook containers: - name: script - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index d48448562..f0a1f082a 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -279,7 +279,7 @@ needed by the Operator. Also update the Custom Resource Definitions (CRDs). First get the latest common resources manifests that contain the latest changes for Rook v1.6. ```sh -git clone --single-branch --depth=1 --branch v1.6.0 https://github.com/rook/rook.git +git clone --single-branch --depth=1 --branch v1.7.0-beta.0 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/ceph ``` diff --git a/Documentation/nfs.md b/Documentation/nfs.md index e8227e823..cff169f12 100644 --- a/Documentation/nfs.md +++ b/Documentation/nfs.md @@ -23,7 +23,7 @@ You can read further about the details and limitations of these volumes in the [ First deploy the Rook NFS operator using the following commands: ```console -$ git clone --single-branch --branch {{ branchName }} https://github.com/rook/rook.git +$ git clone --single-branch --branch v1.7.0-beta.0 https://github.com/rook/rook.git cd rook/cluster/examples/kubernetes/nfs kubectl create -f crds.yaml kubectl create -f operator.yaml diff --git a/cluster/examples/kubernetes/cassandra/operator.yaml b/cluster/examples/kubernetes/cassandra/operator.yaml index cc406664e..ab0bc5602 100644 --- a/cluster/examples/kubernetes/cassandra/operator.yaml +++ b/cluster/examples/kubernetes/cassandra/operator.yaml @@ -109,7 +109,7 @@ spec: serviceAccountName: rook-cassandra-operator containers: - name: rook-cassandra-operator - image: rook/cassandra:master + image: rook/cassandra:v1.7.0-beta.0 imagePullPolicy: "Always" args: ["cassandra", "operator"] env: diff --git a/cluster/examples/kubernetes/ceph/direct-mount.yaml b/cluster/examples/kubernetes/ceph/direct-mount.yaml index ad0af7779..5b89a47be 100644 --- a/cluster/examples/kubernetes/ceph/direct-mount.yaml +++ b/cluster/examples/kubernetes/ceph/direct-mount.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-direct-mount - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 command: ["/tini"] args: ["-g", "--", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent diff --git a/cluster/examples/kubernetes/ceph/operator-openshift.yaml b/cluster/examples/kubernetes/ceph/operator-openshift.yaml index 5ce9a35ee..5a248c1de 100644 --- a/cluster/examples/kubernetes/ceph/operator-openshift.yaml +++ b/cluster/examples/kubernetes/ceph/operator-openshift.yaml @@ -439,7 +439,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 args: ["ceph", "operator"] volumeMounts: - mountPath: /var/lib/rook diff --git a/cluster/examples/kubernetes/ceph/operator.yaml b/cluster/examples/kubernetes/ceph/operator.yaml index b531ce87e..9ab7ac1ea 100644 --- a/cluster/examples/kubernetes/ceph/operator.yaml +++ b/cluster/examples/kubernetes/ceph/operator.yaml @@ -362,7 +362,7 @@ spec: serviceAccountName: rook-ceph-system containers: - name: rook-ceph-operator - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 args: ["ceph", "operator"] volumeMounts: - mountPath: /var/lib/rook diff --git a/cluster/examples/kubernetes/ceph/osd-purge.yaml b/cluster/examples/kubernetes/ceph/osd-purge.yaml index a472ce71a..c134a8b6c 100644 --- a/cluster/examples/kubernetes/ceph/osd-purge.yaml +++ b/cluster/examples/kubernetes/ceph/osd-purge.yaml @@ -25,7 +25,7 @@ spec: serviceAccountName: rook-ceph-purge-osd containers: - name: osd-removal - image: rook/ceph:master + image: rook/ceph:v1.7.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". args: ["ceph", "osd", "remove", "--osd-ids", ""] diff --git a/cluster/examples/kubernetes/ceph/toolbox-job.yaml b/cluster/examples/kubernetes/ceph/toolbox-job.yaml index 3fee97919..53d0dd8d2 100644 --- a/cluster/examples/kubernetes/ceph/toolbox-job.yaml +++ b/cluster/examples/kubernetes/ceph/toolbox-job.yaml @@ -10,7 +10,7 @@ spec: spec: initContainers: - name: config-init - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 command: ["/usr/local/bin/toolbox.sh"] args: ["--skip-watch"] imagePullPolicy: IfNotPresent @@ -32,7 +32,7 @@ spec: mountPath: /etc/rook containers: - name: script - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 volumeMounts: - mountPath: /etc/ceph name: ceph-config diff --git a/cluster/examples/kubernetes/ceph/toolbox.yaml b/cluster/examples/kubernetes/ceph/toolbox.yaml index 28edc958b..90c715a2d 100644 --- a/cluster/examples/kubernetes/ceph/toolbox.yaml +++ b/cluster/examples/kubernetes/ceph/toolbox.yaml @@ -18,7 +18,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: rook-ceph-tools - image: rook/ceph:master + image: rook/ceph:v1.7.0-beta.0 command: ["/tini"] args: ["-g", "--", "/usr/local/bin/toolbox.sh"] imagePullPolicy: IfNotPresent diff --git a/cluster/examples/kubernetes/nfs/operator.yaml b/cluster/examples/kubernetes/nfs/operator.yaml index b28990977..c19bc7a79 100644 --- a/cluster/examples/kubernetes/nfs/operator.yaml +++ b/cluster/examples/kubernetes/nfs/operator.yaml @@ -122,7 +122,7 @@ spec: serviceAccountName: rook-nfs-operator containers: - name: rook-nfs-operator - image: rook/nfs:master + image: rook/nfs:v1.7.0-beta.0 imagePullPolicy: IfNotPresent args: ["nfs", "operator"] env: diff --git a/cluster/examples/kubernetes/nfs/webhook.yaml b/cluster/examples/kubernetes/nfs/webhook.yaml index af0a918c8..39db0072c 100644 --- a/cluster/examples/kubernetes/nfs/webhook.yaml +++ b/cluster/examples/kubernetes/nfs/webhook.yaml @@ -111,7 +111,7 @@ spec: spec: containers: - name: rook-nfs-webhook - image: rook/nfs:master + image: rook/nfs:v1.7.0-beta.0 imagePullPolicy: IfNotPresent args: ["nfs", "webhook"] ports: diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index d86996b34..de66b53af 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -120,7 +120,7 @@ function build_rook() { tests/scripts/validate_modified_files.sh build docker images if [[ "$build_type" == "build" ]]; then - docker tag $(docker images | awk '/build-/ {print $1}') rook/ceph:master + docker tag $(docker images | awk '/build-/ {print $1}') rook/ceph:v1.7.0-beta.0 fi }