Add project instances

There are a few situations where we need a buffer between a project being deleted and the corresponding namespace being deleted. One such scenario is ensuring that delete jobs run when a project is deleted. This change adds a project instance, which is this buffer. Using the project instance, we can ensure that all apps are successfully cleaned up before the namespace is deleted. This should also give the user the ability to use the ignore-cleanup functionality when deleting a project. Changes are also made to the integration tests to use project instances instead of namespaces. Signed-off-by: Donnie Adams <[email protected]>
acorn-io · Jul 7, 2023 · 0b9b373 · 0b9b373
1 parent 26fd3b4
commit 0b9b373
Show file tree

Hide file tree

Showing 85 changed files with 1,169 additions and 1,111 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	cuelang.org/go v0.5.0
 	github.com/AlecAivazis/survey/v2 v2.3.6
 	github.com/acorn-io/aml v0.0.0-20230707055340-d9d7a8c927b2
-	github.com/acorn-io/baaah v0.0.0-20230628211933-3f682344a78d
+	github.com/acorn-io/baaah v0.0.0-20230707151126-5d519d272865
 	github.com/acorn-io/mink v0.0.0-20230523184405-ceaaa366d500
 	github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78
 	github.com/adrg/xdg v0.4.0

diff --git a/go.sum b/go.sum
@@ -94,8 +94,8 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpH
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/acorn-io/aml v0.0.0-20230707055340-d9d7a8c927b2 h1:zx1YhJI+jecZ1nQ3MzFRblMU4KdACUG8DQfd0zB9XvY=
 github.com/acorn-io/aml v0.0.0-20230707055340-d9d7a8c927b2/go.mod h1:UEx5RRLFjryCEHN2pM59+d8A0mPJ3VAxggJOTzPymwg=
-github.com/acorn-io/baaah v0.0.0-20230628211933-3f682344a78d h1:a+geMqB3U52a4+iMmLZ9R/EXkgxrp0QCetoqLAUnTD8=
-github.com/acorn-io/baaah v0.0.0-20230628211933-3f682344a78d/go.mod h1:LtwaWrYK/VuGptWxeD5Sgl0sgJV1ksicpTzyLilow1U=
+github.com/acorn-io/baaah v0.0.0-20230707151126-5d519d272865 h1:BPPGCEBgPxn7crFFWqLDJUlzdHQ23olFkdUqlXd3KA8=
+github.com/acorn-io/baaah v0.0.0-20230707151126-5d519d272865/go.mod h1:LtwaWrYK/VuGptWxeD5Sgl0sgJV1ksicpTzyLilow1U=
 github.com/acorn-io/mink v0.0.0-20230523184405-ceaaa366d500 h1:tiM36bM+iMWuW9HM+YlM1GfNDXC7f565z8Be5epO0qM=
 github.com/acorn-io/mink v0.0.0-20230523184405-ceaaa366d500/go.mod h1:y6aYj2dF/SlU205bDfA43Y5c9sa/aYr4X5GDqYJzJTU=
 github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78 h1:5zs9L/CXNkuTdJSbhFWczAorbmx67nqlqswx5CQi7XI=

diff --git a/integration/build/build_test.go b/integration/build/build_test.go
@@ -173,9 +173,9 @@ func TestBuildDefault(t *testing.T) {
 func TestMultiArch(t *testing.T) {
 	helper.StartController(t)
 	cfg := helper.StartAPI(t)
-	ns := helper.TempNamespace(t, helper.MustReturn(k8sclient.Default))
+	project := helper.TempProject(t, helper.MustReturn(k8sclient.Default))
 	kclient := helper.MustReturn(k8sclient.Default)
-	c, err := client.New(cfg, "", ns.Name)
+	c, err := client.New(cfg, "", project.Name)
 	if err != nil {
 		t.Fatal()
 	}
@@ -204,7 +204,7 @@ func TestMultiArch(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	opts, err := images.GetAuthenticationRemoteOptions(context.Background(), kclient, ns.Name, remote.WithTransport(transport))
+	opts, err := images.GetAuthenticationRemoteOptions(context.Background(), kclient, project.Name, remote.WithTransport(transport))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -234,8 +234,8 @@ func TestMultiArch(t *testing.T) {
 func TestBuildNestedAcornWithLocalImage(t *testing.T) {
 	helper.StartController(t)
 	cfg := helper.StartAPI(t)
-	ns := helper.TempNamespace(t, helper.MustReturn(k8sclient.Default))
-	c, err := client.New(cfg, "", ns.Name)
+	project := helper.TempProject(t, helper.MustReturn(k8sclient.Default))
+	c, err := client.New(cfg, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -261,8 +261,8 @@ func TestBuildNestedAcornWithLocalImage(t *testing.T) {
 	assert.Equal(t, strings.Split(nestedImage.ImageData.Acorns["nginx"].Image, "sha256:")[1], image)
 
 	// create a second project and make sure we can't access the local image from the first project
-	ns2 := helper.TempNamespace(t, helper.MustReturn(k8sclient.Default))
-	c2, err := client.New(cfg, "", ns2.Name)
+	project2 := helper.TempProject(t, helper.MustReturn(k8sclient.Default))
+	c2, err := client.New(cfg, "", project2.Name)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/integration/client/apps/apps_test.go b/integration/client/apps/apps_test.go
@@ -20,11 +20,11 @@ func TestAppStartStop(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -67,11 +67,11 @@ func TestAppDelete(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -103,12 +103,12 @@ func TestAppUpdate(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
-	imageID2 := client2.NewImage2(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
+	imageID2 := client2.NewImage2(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -316,11 +316,11 @@ func TestAppGet(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -345,11 +345,11 @@ func TestAppList(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -376,11 +376,11 @@ func TestAppLog(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -421,11 +421,11 @@ func TestAppRun(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -455,7 +455,7 @@ func TestAppRun(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	assert.Equal(t, ns.Name, app.Namespace)
+	assert.Equal(t, project.Name, app.Namespace)
 	assert.NotEqual(t, "", app.Name)
 	assert.Equal(t, v1.PublishModeAll, app.Spec.PublishMode)
 	assert.Equal(t, "volume", app.Spec.Volumes[0].Volume)
@@ -469,11 +469,11 @@ func TestAppRunImageVariations(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/integration/client/apps/update_test.go b/integration/client/apps/update_test.go
@@ -17,14 +17,14 @@ func TestUpdatePull(t *testing.T) {
 
 	ctx := helper.GetCTX(t)
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 	err = c.ImageTag(ctx, imageID, "foo")
 	if err != nil {
 		t.Fatal(err)
@@ -41,7 +41,7 @@ func TestUpdatePull(t *testing.T) {
 	assert.NotEmpty(t, app.Status.Namespace)
 	assert.Equal(t, app.Status.AppImage.ID, imageID)
 
-	imageID2 := client2.NewImage2(t, ns.Name)
+	imageID2 := client2.NewImage2(t, project.Name)
 	err = c.ImageTag(ctx, imageID2, "foo:latest")
 	if err != nil {
 		t.Fatal(err)

diff --git a/integration/client/client_test.go b/integration/client/client_test.go
@@ -20,7 +20,7 @@ import (
 
 func TestAppsSSA(t *testing.T) {
 	cfg := helper.StartAPI(t)
-	c, ns := helper.ClientAndNamespace(t)
+	c, project := helper.ClientAndProject(t)
 	ctx := helper.GetCTX(t)
 
 	dyn, err := dynamic.NewForConfig(cfg)
@@ -42,7 +42,7 @@ func TestAppsSSA(t *testing.T) {
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "test",
-			Namespace: ns.Name,
+			Namespace: project.Name,
 		},
 		Spec: v1.AppInstanceSpec{
 			Image: image.ID,
@@ -53,7 +53,7 @@ func TestAppsSSA(t *testing.T) {
 	}
 
 	_, err = dyn.Resource(apiv1.SchemeGroupVersion.WithResource("apps")).
-		Namespace(ns.Name).
+		Namespace(project.Name).
 		Patch(ctx, "test", types.ApplyPatchType, appBytes, metav1.PatchOptions{
 			FieldManager: "unit-test",
 		})
@@ -73,7 +73,7 @@ func TestFriendlyNameInContainer(t *testing.T) {
 	helper.StartController(t)
 	cfg := helper.StartAPI(t)
 
-	c, ns := helper.ClientAndNamespace(t)
+	c, project := helper.ClientAndProject(t)
 	ctx := helper.GetCTX(t)
 	client, err := k8sclient.New(cfg)
 	if err != nil {
@@ -90,7 +90,7 @@ func TestFriendlyNameInContainer(t *testing.T) {
 	appInstance := &apiv1.App{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: "simple-app",
-			Namespace:    ns.Name,
+			Namespace:    project.Name,
 			Labels: map[string]string{
 				labels.AcornManaged: "true",
 			},
@@ -109,7 +109,7 @@ func TestFriendlyNameInContainer(t *testing.T) {
 		return obj.Status.AppStatus.Containers["default"].ReadyReplicaCount == 1
 	})
 
-	c, err = hclient.New(cfg, "", ns.Name)
+	c, err = hclient.New(cfg, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/integration/client/computeclass/computeclass_test.go b/integration/client/computeclass/computeclass_test.go
@@ -16,9 +16,9 @@ import (
 func TestCreatingComputeClasses(t *testing.T) {
 	helper.StartController(t)
 	cfg := helper.StartAPI(t)
-	ns := helper.TempNamespace(t, helper.MustReturn(kclient.Default))
+	project := helper.TempProject(t, helper.MustReturn(kclient.Default))
 	kclient := helper.MustReturn(kclient.Default)
-	c, err := client.New(cfg, "", ns.Name)
+	c, err := client.New(cfg, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/integration/client/containers/containers_test.go b/integration/client/containers/containers_test.go
@@ -24,14 +24,14 @@ func TestContainerList(t *testing.T) {
 		t.Fatal(err)
 	}
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 	app, err := c.AppRun(ctx, imageID, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -61,14 +61,14 @@ func TestContainerDelete(t *testing.T) {
 		t.Fatal(err)
 	}
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 	app, err := c.AppRun(ctx, imageID, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -109,14 +109,14 @@ func TestContainerGet(t *testing.T) {
 		t.Fatal(err)
 	}
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 	app, err := c.AppRun(ctx, imageID, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -153,14 +153,14 @@ func TestContainerExec(t *testing.T) {
 		t.Fatal(err)
 	}
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 	app, err := c.AppRun(ctx, imageID, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -207,14 +207,14 @@ func TestContainerDebugExec(t *testing.T) {
 		t.Fatal(err)
 	}
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	imageID := client2.NewImage(t, ns.Name)
+	imageID := client2.NewImage(t, project.Name)
 	app, err := c.AppRun(ctx, imageID, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -263,14 +263,14 @@ func TestContainerWithSidecarExec(t *testing.T) {
 		t.Fatal(err)
 	}
 	kclient := helper.MustReturn(kclient.Default)
-	ns := helper.TempNamespace(t, kclient)
+	project := helper.TempProject(t, kclient)
 
-	c, err := client.New(restConfig, "", ns.Name)
+	c, err := client.New(restConfig, "", project.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	imageID := client2.NewImageWithSidecar(t, ns.Name)
+	imageID := client2.NewImageWithSidecar(t, project.Name)
 	app, err := c.AppRun(ctx, imageID, nil)
 	if err != nil {
 		t.Fatal(err)