Merge pull request #299 from red-hat-storage/sync_us--devel

Syncing latest changes from upstream devel for ceph-csi
red-hat-storage · Apr 26, 2024 · 7d6a933 · 7d6a933
2 parents da063f1 + 60e2527
commit 7d6a933
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -142,15 +142,12 @@ pull_request_rules:
       - "status-success=golangci-lint"
       - "status-success=mod-check"
       - "status-success=lint-extras"
-      - "status-success=ci/centos/k8s-e2e-external-storage/1.26"
       - "status-success=ci/centos/k8s-e2e-external-storage/1.27"
       - "status-success=ci/centos/k8s-e2e-external-storage/1.28"
       - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
-      - "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
       - "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
       - "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
       - "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
-      - "status-success=ci/centos/mini-e2e/k8s-1.26"
       - "status-success=ci/centos/mini-e2e/k8s-1.27"
       - "status-success=ci/centos/mini-e2e/k8s-1.28"
       - "status-success=ci/centos/mini-e2e/k8s-1.29"
@@ -187,15 +184,12 @@ pull_request_rules:
               - "status-success=lint-extras"
               - "status-success=mod-check"
               - "status-success=multi-arch-build"
-              - "status-success=ci/centos/k8s-e2e-external-storage/1.26"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.27"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.28"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
-              - "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e/k8s-1.26"
               - "status-success=ci/centos/mini-e2e/k8s-1.27"
               - "status-success=ci/centos/mini-e2e/k8s-1.28"
               - "status-success=ci/centos/mini-e2e/k8s-1.29"
@@ -227,6 +221,32 @@ pull_request_rules:
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
               - "status-success=DCO"
+          - and:
+              - label!=DNM
+              - base=devel
+              - "#approved-reviews-by>=2"
+              - "#changes-requested-reviews-by=0"
+              - "approved-reviews-by=@ceph/ceph-csi-contributors"
+              - "approved-reviews-by=@ceph/ceph-csi-maintainers"
+              - "status-success=codespell"
+              - "status-success=multi-arch-build"
+              - "status-success=go-test"
+              - "status-success=golangci-lint"
+              - "status-success=commitlint"
+              - "status-success=mod-check"
+              - "status-success=lint-extras"
+              - "status-success=ci/centos/k8s-e2e-external-storage/1.27"
+              - "status-success=ci/centos/k8s-e2e-external-storage/1.28"
+              - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
+              - "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
+              - "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
+              - "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
+              - "status-success=ci/centos/mini-e2e/k8s-1.27"
+              - "status-success=ci/centos/mini-e2e/k8s-1.28"
+              - "status-success=ci/centos/mini-e2e/k8s-1.29"
+              - "status-success=ci/centos/upgrade-tests-cephfs"
+              - "status-success=ci/centos/upgrade-tests-rbd"
+              - "status-success=DCO"
     actions:
       queue:
         name: default
@@ -248,15 +268,12 @@ pull_request_rules:
               - "status-success=mod-check"
               - "status-success=lint-extras"
               - "#changes-requested-reviews-by=0"
-              - "status-success=ci/centos/k8s-e2e-external-storage/1.26"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.27"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.28"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
-              - "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e/k8s-1.26"
               - "status-success=ci/centos/mini-e2e/k8s-1.27"
               - "status-success=ci/centos/mini-e2e/k8s-1.28"
               - "status-success=ci/centos/mini-e2e/k8s-1.29"

diff --git a/api/deploy/kubernetes/csi-config-map.go b/api/deploy/kubernetes/csi-config-map.go
@@ -46,6 +46,8 @@ type RBD struct {
 	NetNamespaceFilePath string `json:"netNamespaceFilePath"`
 	// RadosNamespace is a rados namespace in the pool
 	RadosNamespace string `json:"radosNamespace"`
+	// RBD mirror daemons running in the ceph cluster.
+	MirrorDaemonCount int `json:"mirrorDaemonCount"`
 }
 
 type NFS struct {

diff --git a/scripts/Dockerfile.test b/scripts/Dockerfile.test
@@ -8,7 +8,7 @@
 # little different.
 #
 
-FROM registry.fedoraproject.org/fedora:latest
+FROM registry.fedoraproject.org/fedora:39
 
 ARG GOPATH=/go
 ARG GOROOT=/usr/local/go