From 082858bf53d8202d469ca5bb802594739bd9743b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 30 Jul 2021 16:01:18 +0200 Subject: [PATCH] ceph: use v16 for mirroring test in ci MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CI test for mirroring now runs on stable v16 tag. Internally our code has a minimum version of 16.2.5 for cephfs mirroring since it's available. Signed-off-by: Sébastien Han --- .github/workflows/canary-integration-test.yml | 1 - pkg/operator/ceph/file/controller.go | 5 ++--- pkg/operator/ceph/file/mirror/config.go | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index d2d89fcad..8a5a092d0 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -727,7 +727,6 @@ jobs: yq w -i -d1 cluster-test.yaml spec.dashboard.enabled false yq w -i -d1 cluster-test.yaml spec.storage.useAllDevices false yq w -i -d1 cluster-test.yaml spec.storage.deviceFilter ${BLOCK}1 - yq w -i -d1 cluster-test.yaml spec.cephVersion.image ceph/daemon-base:latest-pacific-devel kubectl create -f cluster-test.yaml -f rbdmirror.yaml -f filesystem-mirror.yaml -f toolbox.yaml # cephfs-mirroring is a push operation diff --git a/pkg/operator/ceph/file/controller.go b/pkg/operator/ceph/file/controller.go index 406de8527..fb74c3571 100644 --- a/pkg/operator/ceph/file/controller.go +++ b/pkg/operator/ceph/file/controller.go @@ -31,6 +31,7 @@ import ( "github.com/rook/rook/pkg/operator/ceph/cluster/mon" opconfig "github.com/rook/rook/pkg/operator/ceph/config" opcontroller "github.com/rook/rook/pkg/operator/ceph/controller" + "github.com/rook/rook/pkg/operator/ceph/file/mirror" "github.com/rook/rook/pkg/operator/k8sutil" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -289,9 +290,7 @@ func (r *ReconcileCephFilesystem) reconcile(request reconcile.Request) (reconcil } // Enable mirroring if needed - // TODO: change me to 16.2.5 once it's out, in the mean this allows us to run the CI and validate the code - // if r.clusterInfo.CephVersion.IsAtLeast(mirror.PeerAdditionMinVersion) { - if r.clusterInfo.CephVersion.IsAtLeastPacific() { + if r.clusterInfo.CephVersion.IsAtLeast(mirror.PeerAdditionMinVersion) { // Disable mirroring on that filesystem if needed if cephFilesystem.Spec.Mirroring != nil { if !cephFilesystem.Spec.Mirroring.Enabled { diff --git a/pkg/operator/ceph/file/mirror/config.go b/pkg/operator/ceph/file/mirror/config.go index 4314c51a8..2edc5bdf8 100644 --- a/pkg/operator/ceph/file/mirror/config.go +++ b/pkg/operator/ceph/file/mirror/config.go @@ -41,8 +41,7 @@ const ( var ( // PeerAdditionMinVersion This version includes a number of fixes for snapshots and mirror status - // TODO change me to 16.2.5 - PeerAdditionMinVersion = version.CephVersion{Major: 16, Minor: 2, Extra: 2} + PeerAdditionMinVersion = version.CephVersion{Major: 16, Minor: 2, Extra: 5} ) // daemonConfig for a single rbd-mirror