Merge pull request #1389 from thedadams/gh-1388

Ensure calculated default set on project (#1388)

Author: thedadams

integration/client/projects/projects_test.go

@@ -22,10 +22,6 @@ func TempNamespace(t *testing.T, client client.Client) *corev1.Namespace {
 				"test.acorn.io/namespace": "true",
 				labels.AcornProject:       "true",
 			},
-			Annotations: map[string]string{
-				labels.AcornProjectDefaultRegion:    "local",
-				labels.AcornProjectSupportedRegions: "local",
-			},
 		},
 		Spec:   corev1.NamespaceSpec{},
 		Status: corev1.NamespaceStatus{},

integration/helper/namespace.go

@@ -1119,57 +1119,6 @@ func TestAppWithBadRegion(t *testing.T) {
 	}
 }
 
-func TestAppUpdateRegion(t *testing.T) {
-	helper.StartController(t)
-
-	k8sclient := helper.MustReturn(kclient.Default)
-	ctx := helper.GetCTX(t)
-	c, _ := helper.ClientAndNamespace(t)
-
-	image, err := c.AcornImageBuild(ctx, "./testdata/simple/Acornfile", &client.AcornImageBuildOptions{
-		Cwd: "./testdata/simple",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	app, err := c.AppRun(ctx, image.ID, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	app = helper.WaitForObject(t, helper.Watcher(t, c), &apiv1.AppList{}, app, func(obj *apiv1.App) bool {
-		return obj.Status.Condition(v1.AppInstanceConditionParsed).Success &&
-			obj.Status.Condition(v1.AppInstanceConditionReady).Success
-	})
-
-	for {
-		// Update the app region to be `local`, which should be the default
-		if err = k8sclient.Get(ctx, kclient.ObjectKey{Namespace: app.Namespace, Name: app.Name}, app); err != nil {
-			t.Fatal(err)
-		}
-		app.Spec.Region = "local"
-		if err = k8sclient.Update(ctx, app); err == nil {
-			break
-		} else if !apierrors.IsConflict(err) {
-			t.Fatal(err)
-		}
-	}
-
-	for {
-		// Now try to update the app region to something else, which should fail
-		if err = k8sclient.Get(ctx, kclient.ObjectKey{Namespace: app.Namespace, Name: app.Name}, app); err != nil {
-			t.Fatal(err)
-		}
-		app.Spec.Region = "non-local"
-		if err = k8sclient.Update(ctx, app); err == nil {
-			t.Fatal("expected error")
-		} else if !apierrors.IsConflict(err) {
-			break
-		}
-	}
-}
-
 func getStorageClassName(t *testing.T, storageClasses *storagev1.StorageClassList) string {
 	t.Helper()
 	if len(storageClasses.Items) == 0 {

integration/run/run_test.go

@@ -45,10 +45,6 @@ func calculate(req router.Request, appInstance *internalv1.AppInstance) error {
 		return err
 	}
 
-	if err = addDefaultRegion(req.Ctx, req.Client, appInstance); err != nil {
-		return err
-	}
-
 	if err = addVolumeClassDefaults(req.Ctx, req.Client, appInstance); err != nil {
 		return err
 	}