11

Author: aledbf

test/tests/components/ws-manager/maintenence_test.go

@@ -7,9 +7,12 @@ package wsmanager
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"testing"
 	"time"
 
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
@@ -34,33 +37,25 @@ func TestMaintenance(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			futureTime := time.Now().Add(1 * time.Hour)
-			mcfg := config.MaintenanceConfig{
-				EnabledUntil: &futureTime,
-			}
-
-			data, err := json.Marshal(mcfg)
+			untilTime := time.Now().Add(1 * time.Hour)
+			cmap, err := maintenanceConfigmap(&untilTime)
 			if err != nil {
 				t.Fatal(err)
 			}
 
-			configMap := &corev1.ConfigMap{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "ws-manager-mk2-maintenance-mode",
-					Namespace: "default",
-				},
-				Data: map[string]string{
-					"config.json": string(data),
-				},
-			}
-
-			err = kubeClient.Resources().Update(testCtx, configMap)
+			err = kubeClient.Resources().Update(testCtx, cmap)
 			if err != nil {
 				t.Fatal(err)
 			}
 
 			t.Cleanup(func() {
-				err := kubeClient.Resources().Delete(testCtx, configMap)
+				cmap, err := maintenanceConfigmap(nil)
+				if err != nil {
+					t.Error(err)
+					return
+				}
+
+				err = kubeClient.Resources().Update(testCtx, cmap)
 				if err != nil {
 					t.Error(err)
 				}
@@ -89,7 +84,7 @@ func TestMaintenance(t *testing.T) {
 			}
 
 			nfo, stopWs, err := integration.LaunchWorkspaceDirectly(t, ctx, api, integration.WithRequestModifier(addInitTask))
-			if err != nil {
+			if err != nil && !errors.Is(err, status.Error(codes.FailedPrecondition, "under maintenance")) {
 				t.Fatal(err)
 			}
 
@@ -114,4 +109,24 @@ func TestMaintenance(t *testing.T) {
 	testEnv.Test(t, f)
 }
 
-//
+func maintenanceConfigmap(untilTime *time.Time) (*corev1.ConfigMap, error) {
+	mcfg := config.MaintenanceConfig{}
+	if untilTime != nil {
+		mcfg.EnabledUntil = untilTime
+	}
+
+	data, err := json.Marshal(mcfg)
+	if err != nil {
+		return nil, err
+	}
+
+	return &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "ws-manager-mk2-maintenance-mode",
+			Namespace: "default",
+		},
+		Data: map[string]string{
+			"config.json": string(data),
+		},
+	}, nil
+}