Merge pull request #13612 from rook/mergify/bp/release-1.13/pr-13609

helm: Remove duplicated toolbox keyring (backport #13609)

deploy/charts/library/templates/_cluster-role.tpl

@@ -12,7 +12,7 @@ rules:
   # validating the connection details and for key rotation operations.
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["get","update"]
+    verbs: ["get", "update"]
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get", "list", "watch", "create", "update", "delete"]
@@ -141,10 +141,10 @@ rules:
     verbs: ["get"]
   - apiGroups: ["apps"]
     resources: ["deployments"]
-    verbs: ["get", "delete" ]
+    verbs: ["get", "delete"]
   - apiGroups: ["batch"]
     resources: ["jobs"]
-    verbs: ["get", "list", "delete" ]
+    verbs: ["get", "list", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "update", "delete", "list"]

deploy/charts/rook-ceph-cluster/templates/deployment.yaml

@@ -86,7 +86,6 @@ spec:
               # create the keyring file
               cat <<EOF > ${KEYRING_FILE}
               [${ROOK_CEPH_USERNAME}]
-              key = ${ROOK_CEPH_SECRET}
               key = ${ceph_secret}
               EOF
 
@@ -127,8 +126,8 @@ spec:
           configMap:
             name: rook-ceph-mon-endpoints
             items:
-                - key: data
-                  path: mon-endpoints
+            - key: data
+              path: mon-endpoints
         - name: ceph-config
           emptyDir: {}
       tolerations:

deploy/charts/rook-ceph/templates/clusterrole.yaml

@@ -506,7 +506,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: [ "get", "list", "watch", "patch", "update"]
+    verbs: ["get", "list", "watch", "patch", "update"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
     verbs: ["update", "patch"]
@@ -585,7 +585,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: [ "get", "list", "watch", "patch", "update"]
+    verbs: ["get", "list", "watch", "patch", "update"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
     verbs: ["update", "patch"]

deploy/charts/rook-ceph/templates/configmap.yaml

@@ -116,7 +116,7 @@ data:
 {{- end }}
 {{- end }}
 {{- if .Values.csi.readAffinity }}
-  CSI_ENABLE_READ_AFFINITY : {{ .Values.csi.readAffinity.enabled | quote }}
+  CSI_ENABLE_READ_AFFINITY: {{ .Values.csi.readAffinity.enabled | quote }}
 {{- if .Values.csi.readAffinity.crushLocationLabels }}
   CSI_CRUSH_LOCATION_LABELS: {{ .Values.csi.readAffinity.crushLocationLabels | join "," }}
 {{- end }}

deploy/examples/storageclass-bucket-delete.yaml

@@ -1,16 +1,16 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-   name: rook-ceph-delete-bucket
+  name: rook-ceph-delete-bucket
 provisioner: rook-ceph.ceph.rook.io/bucket # driver:namespace:cluster
 # set the reclaim policy to delete the bucket and all objects
 # when its OBC is deleted.
 reclaimPolicy: Delete
 parameters:
-   objectStoreName: my-store
-   objectStoreNamespace: rook-ceph # namespace:cluster
-   # To accommodate brownfield cases reference the existing bucket name here instead
-   # of in the ObjectBucketClaim (OBC). In this case the provisioner will grant
-   # access to the bucket by creating a new user, attaching it to the bucket, and
-   # providing the credentials via a Secret in the namespace of the requesting OBC.
-   #bucketName:
+  objectStoreName: my-store
+  objectStoreNamespace: rook-ceph # namespace:cluster
+  # To accommodate brownfield cases reference the existing bucket name here instead
+  # of in the ObjectBucketClaim (OBC). In this case the provisioner will grant
+  # access to the bucket by creating a new user, attaching it to the bucket, and
+  # providing the credentials via a Secret in the namespace of the requesting OBC.
+  #bucketName: