Merge pull request #72 from ceph/devel

Sync devel branch with uptream

.mergify.yml

@@ -37,7 +37,6 @@ queue_rules:
               - "status-success=ci/centos/mini-e2e/k8s-1.23"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
-              - "status-success=DCO"
           - and:
               - base=release-v3.4
               - "status-success=codespell"
@@ -55,12 +54,10 @@ queue_rules:
               - "status-success=ci/centos/mini-e2e/k8s-1.23"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
-              - "status-success=DCO"
           - and:
               - base=ci/centos
               - "status-success=ci/centos/job-validation"
               - "status-success=ci/centos/jjb-validate"
-              - "status-success=DCO"
 
 pull_request_rules:
   - name: remove outdated approvals
@@ -110,8 +107,15 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
+
+  - name: dismiss review of merged pull request
+    conditions:
+      - base~=^(devel)|(release-.+)$
+      - merged
+    actions:
+      dismiss_reviews: {}
+
   - name: automatic merge
     conditions:
       - label!=DNM
@@ -142,8 +146,8 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
+
   - name: automatic merge PR having ready-to-merge label
     conditions:
       - label!=DNM
@@ -173,7 +177,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   - name: backport patches to release-v3.5 branch
     conditions:
@@ -252,7 +255,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   - name: remove outdated approvals on ci/centos
     conditions:
@@ -275,7 +277,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   - name: automatic merge PR having ready-to-merge label on ci/centos
     conditions:
@@ -290,7 +291,6 @@ pull_request_rules:
     actions:
       queue:
         name: default
-      dismiss_reviews: {}
       delete_head_branch: {}
   ##
   ## Automatically set/remove labels

Makefile

@@ -203,6 +203,7 @@ ifeq ($(USE_PULLED_IMAGE),no)
 .devel-container-id: GOARCH ?= $(shell go env GOARCH 2>/dev/null)
 .devel-container-id: .container-cmd scripts/Dockerfile.devel
 	[ ! -f .devel-container-id ] || $(CONTAINER_CMD) rmi $(CSI_IMAGE_NAME):devel
+	$(RM) .devel-container-id
 	$(CONTAINER_CMD) build $(CPUSET) --build-arg BASE_IMAGE=$(BASE_IMAGE) --build-arg GOARCH=$(GOARCH) -t $(CSI_IMAGE_NAME):devel -f ./scripts/Dockerfile.devel .
 	$(CONTAINER_CMD) inspect -f '{{.Id}}' $(CSI_IMAGE_NAME):devel > .devel-container-id
 else
@@ -216,6 +217,7 @@ ifeq ($(USE_PULLED_IMAGE),no)
 # create a (cached) container image with dependencies for testing cephcsi
 .test-container-id: .container-cmd build.env scripts/Dockerfile.test
 	[ ! -f .test-container-id ] || $(CONTAINER_CMD) rmi $(CSI_IMAGE_NAME):test
+	$(RM) .test-container-id
 	$(CONTAINER_CMD) build $(CPUSET) --build-arg GOARCH=$(GOARCH) -t $(CSI_IMAGE_NAME):test -f ./scripts/Dockerfile.test .
 	$(CONTAINER_CMD) inspect -f '{{.Id}}' $(CSI_IMAGE_NAME):test > .test-container-id
 else

build.env

@@ -27,7 +27,7 @@ GOLANGCI_VERSION=v1.43.0
 
 # external snapshotter version
 # Refer: https://github.com/kubernetes-csi/external-snapshotter/releases
-SNAPSHOT_VERSION=v4.0.0
+SNAPSHOT_VERSION=v5.0.1
 
 # "go test" configuration
 # set to stdout or html to enable coverage reporting, disabled by default
@@ -49,7 +49,7 @@ ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v16
 
 # CSI sidecar version
 CSI_ATTACHER_VERSION=v3.4.0
-CSI_SNAPSHOTTER_VERSION=v4.2.0
+CSI_SNAPSHOTTER_VERSION=v5.0.1
 CSI_PROVISIONER_VERSION=v3.1.0
 CSI_RESIZER_VERSION=v1.4.0
 CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.4.0

charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml

@@ -27,16 +27,19 @@ rules:
     verbs: ["list", "watch", "create", "update", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots"]
-    verbs: ["get", "list"]
+    verbs: ["get", "list", "patch"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots/status"]
+    verbs: ["update", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
+    verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotclasses"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
-    verbs: ["update"]
+    verbs: ["update", "patch"]
 {{- if .Values.provisioner.attacher.enabled }}
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]

charts/ceph-csi-rbd/README.md

@@ -149,7 +149,6 @@ charts and their default values.
 | `storageClass.clusterID`                       | String representing a Ceph cluster to provision storage from                                                                                         | `<cluster-ID>`                                     |
 | `storageClass.dataPool`                        | Specifies the erasure coded pool                                                                                                                     | `""`                                               |
 | `storageClass.pool`                            | Ceph pool into which the RBD image shall be created                                                                                                  | `replicapool`                                      |
-| `storageClass.thickProvision`                  | Specifies whether thick provision should be enabled                                                                                                  | `false`                                            |
 | `storageclass.imageFeatures`                   | Specifies RBD image features                                                                                                                         | `layering`                                         |
 | `storageclass.tryOtherMounters`                | Specifies whether to try other mounters in case if the current mounter fails to mount the rbd image for any reason                                   | `false`                                            |
 | `storageClass.mounter`                         | Specifies RBD mounter                                                                                                                                | `""`                                               |

charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml

@@ -38,16 +38,19 @@ rules:
 {{- end }}
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots"]
-    verbs: ["get", "list"]
+    verbs: ["get", "list", "patch"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots/status"]
+    verbs: ["get", "list", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
+    verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotclasses"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
-    verbs: ["update"]
+    verbs: ["update", "patch"]
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get"]

charts/ceph-csi-rbd/templates/storageclass.yaml

@@ -18,7 +18,6 @@ parameters:
   clusterID: {{ .Values.storageClass.clusterID }}
   pool: {{ .Values.storageClass.pool }}
   imageFeatures: {{ .Values.storageClass.imageFeatures }}
-  thickProvision: {{ .Values.storageClass.thickProvision | quote}}
 {{- if .Values.storageClass.tryOtherMounters }}
   tryOtherMounters: {{ .Values.storageClass.tryOtherMounters | quote}}
 {{- end }}

charts/ceph-csi-rbd/values.yaml

@@ -279,10 +279,6 @@ storageClass:
   # eg: pool: replicapool
   pool: replicapool
 
-  # Set thickProvision to true if you want RBD images to be fully allocated on
-  # creation (thin provisioning is the default).
-  thickProvision: false
-
   # (required) RBD image features, CSI creates image with image-format 2
   # CSI RBD currently supports `layering`, `journaling`, `exclusive-lock`,
   # `object-map`, `fast-diff` features. If `journaling` is enabled, must
@@ -427,14 +423,6 @@ cephconf: |
     auth_service_required = cephx
     auth_client_required = cephx
 
-    # Workaround for http://tracker.ceph.com/issues/23446
-    fuse_set_user_groups = false
-
-    # ceph-fuse which uses libfuse2 by default has write buffer size of 2KiB
-    # adding 'fuse_big_writes = true' option by default to override this limit
-    # see https://github.com/ceph/ceph-csi/issues/1928
-    fuse_big_writes = true
-
 #########################################################
 # Variables for 'internal' use please use with caution! #
 #########################################################

deploy/cephcsi/image/Dockerfile

@@ -23,6 +23,11 @@ RUN source /build.env && \
 # test if the downloaded version of Golang works (different arch?)
 RUN ${GOROOT}/bin/go version && ${GOROOT}/bin/go env
 
+# FIXME: Ceph does not need Apache Arrow anymore, some container images may
+# still have the repository enabled. Disabling the repository can be removed in
+# the future, see https://github.com/ceph/ceph-container/pull/1990 .
+RUN dnf config-manager --disable apache-arrow-centos || true
+
 RUN dnf -y install \
 	librados-devel librbd-devel \
 	/usr/bin/cc \

deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml

@@ -76,7 +76,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-snapshotter
-          image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0
+          image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1
           args:
             - "--csi-address=$(ADDRESS)"
             - "--v=5"

deploy/cephfs/kubernetes/csi-provisioner-rbac.yaml

@@ -31,9 +31,12 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots"]
     verbs: ["get", "list"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots/status"]
+    verbs: ["get", "list", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
+    verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotclasses"]
     verbs: ["get", "list", "watch"]
@@ -51,7 +54,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
-    verbs: ["update"]
+    verbs: ["update", "patch"]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

deploy/rbd/kubernetes/csi-provisioner-rbac.yaml

@@ -35,10 +35,13 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots"]
-    verbs: ["get", "list"]
+    verbs: ["get", "list", "patch"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots/status"]
+    verbs: ["get", "list", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
+    verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotclasses"]
     verbs: ["get", "list", "watch"]
@@ -53,7 +56,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
-    verbs: ["update"]
+    verbs: ["update", "patch"]
   - apiGroups: [""]
     resources: ["configmaps"]
     verbs: ["get"]

deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml

@@ -67,7 +67,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-snapshotter
-          image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0
+          image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1
           args:
             - "--csi-address=$(ADDRESS)"
             - "--v=5"