From a9c3e00c2ddea3693958bcff3957684dc00984fa Mon Sep 17 00:00:00 2001 From: Anton Skriptsov Date: Thu, 11 Apr 2019 12:29:38 -0700 Subject: [PATCH] Edgefs v1beta1 CI tests Signed-off-by: Anton Skriptsov --- tests/framework/installer/edgefs_installer.go | 2 +- tests/framework/installer/edgefs_manifest.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/framework/installer/edgefs_installer.go b/tests/framework/installer/edgefs_installer.go index d57c2ccc6..c441e70d2 100644 --- a/tests/framework/installer/edgefs_installer.go +++ b/tests/framework/installer/edgefs_installer.go @@ -119,7 +119,7 @@ func (h *EdgefsInstaller) UninstallEdgefs(systemNamespace, namespace string) { checkError(h.T(), err, fmt.Sprintf("cannot remove cluster %s", namespace)) crdCheckerFunc := func() error { - _, err := h.k8shelper.RookClientset.EdgefsV1alpha1().Clusters(namespace).Get(namespace, metav1.GetOptions{}) + _, err := h.k8shelper.RookClientset.EdgefsV1beta1().Clusters(namespace).Get(namespace, metav1.GetOptions{}) return err } diff --git a/tests/framework/installer/edgefs_manifest.go b/tests/framework/installer/edgefs_manifest.go index 80d11ab1f..6ed04a87e 100644 --- a/tests/framework/installer/edgefs_manifest.go +++ b/tests/framework/installer/edgefs_manifest.go @@ -31,7 +31,7 @@ spec: plural: clusters singular: cluster scope: Namespaced - version: v1alpha1 + version: v1beta1 ` } @@ -173,7 +173,7 @@ spec: serviceAccountName: rook-edgefs-system containers: - name: rook-edgefs-operator - image: rook/edgefs:master + image: edgefs/edgefs-operator:v1beta1 #JUST FOR TRANSITION TO Beta1. MUST BE CHANGED TO rook/edgefs:master after merge imagePullPolicy: "Always" args: ["edgefs", "operator"] env: @@ -307,7 +307,7 @@ subjects: name: rook-edgefs-cluster namespace: ` + namespace + ` --- -apiVersion: edgefs.rook.io/v1alpha1 +apiVersion: edgefs.rook.io/v1beta1 kind: Cluster metadata: name: rook-edgefs