Merge pull request #547 from red-hat-storage/sync_ds--release-1.13

Syncing latest changes from release-1.13 for rook
red-hat-storage · Dec 14, 2023 · 77ad528 · 77ad528
2 parents 4035a3a + 3e0bd4a
commit 77ad528
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml
@@ -1213,7 +1213,7 @@ jobs:
       - name: create replicated mirrored filesystem on cluster 2
         run: |
           cd deploy/examples/
-          yq w -i filesystem-test.yaml metadata.namespace rook-ceph-secondary
+          sed -i 's/namespace: rook-ceph/namespace: rook-ceph-secondary/g' filesystem-test.yaml
           yq w -i filesystem-test.yaml spec.mirroring.enabled true
           kubectl create -f filesystem-test.yaml
 

diff --git 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 v1.13.0-beta.0 https://github.com/rook/rook.git
+$ git clone --single-branch --branch v1.13.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
@@ -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.0-beta.0 https://github.com/rook/rook.git
+$ git clone --single-branch --branch v1.13.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
@@ -111,6 +111,8 @@ The upgrade steps in this guide will clarify what Helm handles automatically.
 
 The `rook-ceph` helm chart upgrade performs the Rook upgrade.
 The `rook-ceph-cluster` helm chart upgrade performs a [Ceph upgrade](#ceph-version-upgrades) if the Ceph image is updated.
+The `rook-ceph` chart should be upgraded before `rook-ceph-cluster`, so the latest operator has the opportunity to update
+custom resources as necessary.
 
 !!! note
     Be sure to update to a [supported Helm version](https://helm.sh/docs/topics/version_skew/#supported-version-skew)
@@ -154,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.0-beta.0 https://github.com/rook/rook.git
+git clone --single-branch --depth=1 --branch v1.13.0 https://github.com/rook/rook.git
 cd rook/deploy/examples
 ```
 
@@ -193,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.0-beta.0
+kubectl -n $ROOK_OPERATOR_NAMESPACE set image deploy/rook-ceph-operator rook-ceph-operator=rook/ceph:v1.13.0
 ```
 
 ### **3. Update Ceph CSI**

diff --git a/deploy/examples/create-external-cluster-resources.py b/deploy/examples/create-external-cluster-resources.py
@@ -997,8 +997,8 @@ def get_rbd_node_caps_and_entity(self):
 
         return caps, entity
 
-    def get_healthchecker_caps_and_entity(self):
-        entity = "client.healthchecker"
+    def get_defaultUser_caps_and_entity(self):
+        entity = self.run_as_user
         caps = {
             "mon": "allow r, allow command quorum_status, allow command version",
             "mgr": "allow command config",
@@ -1027,7 +1027,7 @@ def get_caps_and_entity(self, user_name):
         if "client.healthchecker" in user_name:
             if "client.healthchecker" != user_name:
                 self._arg_parser.restricted_auth_permission = True
-            return self.get_healthchecker_caps_and_entity()
+            return self.get_defaultUser_caps_and_entity()
 
         raise ExecutionFailureException(
             f"no user found with user_name: {user_name}, "

diff --git 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.13.0-beta.0
+          image: rook/ceph:v1.13.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
@@ -8,4 +8,4 @@
  registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
  registry.k8s.io/sig-storage/csi-resizer:v1.9.2
  registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
- rook/ceph:v1.13.0-beta.0
+ rook/ceph:v1.13.0
diff --git a/deploy/examples/multus-validation.yaml b/deploy/examples/multus-validation.yaml
@@ -101,7 +101,7 @@ spec:
       serviceAccountName: rook-ceph-multus-validation
       containers:
         - name: multus-validation
-          image: rook/ceph:v1.13.0-beta.0
+          image: rook/ceph:v1.13.0
           command: ["rook"]
           args:
             - "multus"

diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml
@@ -672,7 +672,7 @@ spec:
       serviceAccountName: rook-ceph-system
       containers:
         - name: rook-ceph-operator
-          image: rook/ceph:v1.13.0-beta.0
+          image: rook/ceph:v1.13.0
           args: ["ceph", "operator"]
           securityContext:
             runAsNonRoot: true

diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml
@@ -598,7 +598,7 @@ spec:
       serviceAccountName: rook-ceph-system
       containers:
         - name: rook-ceph-operator
-          image: rook/ceph:v1.13.0-beta.0
+          image: rook/ceph:v1.13.0
           args: ["ceph", "operator"]
           securityContext:
             runAsNonRoot: true

diff --git 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.13.0-beta.0
+          image: rook/ceph:v1.13.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
@@ -10,7 +10,7 @@ spec:
     spec:
       initContainers:
         - name: config-init
-          image: rook/ceph:v1.13.0-beta.0
+          image: rook/ceph:v1.13.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:v1.13.0-beta.0
+          image: rook/ceph:v1.13.0
           volumeMounts:
             - mountPath: /etc/ceph
               name: ceph-config

diff --git a/deploy/examples/toolbox-operator-image.yaml b/deploy/examples/toolbox-operator-image.yaml
@@ -24,7 +24,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: rook-ceph-tools-operator-image
-          image: rook/ceph:v1.13.0-beta.0
+          image: rook/ceph:v1.13.0
           command:
             - /bin/bash
             - -c