correct difference that occurred during the v1.7.11 pull

pkg/daemon/ceph/client/config.go

@@ -308,31 +308,3 @@ func WriteCephConfig(context *clusterd.Context, clusterInfo *ClusterInfo) error
 	}
 	return nil
 }
-
-// SetConfig applies a setting for a single mgr daemon
-func SetConfig(context *clusterd.Context, clusterInfo *ClusterInfo, daemonID string, key, val string, force bool) (bool, error) {
-	var getArgs, setArgs []string
-	getArgs = append(getArgs, "config", "get", daemonID, key)
-	if val == "" {
-		setArgs = append(setArgs, "config", "rm", daemonID, key)
-	} else {
-		setArgs = append(setArgs, "config", "set", daemonID, key, val)
-	}
-	if force {
-		setArgs = append(setArgs, "--force")
-	}
-
-	// Retrieve previous value to monitor changes
-	var prevVal string
-	buf, err := NewCephCommand(context, clusterInfo, getArgs).Run()
-	if err == nil {
-		prevVal = strings.TrimSpace(string(buf))
-	}
-
-	if _, err := NewCephCommand(context, clusterInfo, setArgs).Run(); err != nil {
-		return false, errors.Wrapf(err, "failed to set config key %s to %q", key, val)
-	}
-
-	hasChanged := prevVal != val
-	return hasChanged, nil
-}

tests/integration/ceph_base_deploy_test.go

@@ -39,12 +39,12 @@ const (
 	// These versions are for running a minimal test suite for more efficient tests across different versions of K8s
 	// instead of running all suites on all versions
 	// To run on multiple versions, add a comma separate list such as 1.16.0,1.17.0
-	flexDriverMinimalTestVersion      = "1.11.0,1.13.0"
-	cephMasterSuiteMinimalTestVersion = "1.12.0"
-	multiClusterMinimalTestVersion    = "1.15.0"
+	flexDriverMinimalTestVersion      = "1.15.0"
+	cephMasterSuiteMinimalTestVersion = "1.16.0"
+	multiClusterMinimalTestVersion    = "1.16.0"
 	helmMinimalTestVersion            = "1.17.0"
-	upgradeMinimalTestVersion         = "1.19.0"
-	smokeSuiteMinimalTestVersion      = "1.20.0"
+	upgradeMinimalTestVersion         = "1.18.0"
+	smokeSuiteMinimalTestVersion      = "1.19.0"
 )
 
 var (

tests/manifests/test-kms-vault-spec.yaml

@@ -6,7 +6,6 @@ spec:
         VAULT_ADDR: https://vault.default.svc.cluster.local:8200
         VAULT_BACKEND_PATH: rook/ver1
         VAULT_SECRET_ENGINE: kv
-        VAULT_BACKEND: v1
         VAULT_SKIP_VERIFY: "true"
         VAULT_CLIENT_KEY: "vault-client-key"
         VAULT_CLIENT_CERT: "vault-client-cert"