test: update kubecost tests

Signed-off-by: Tarun Gupta Akirala <[email protected]>

apptests/appscenarios/kubecost.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"path/filepath"
 
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/mesosphere/kommander-applications/apptests/constants"
 	"github.com/mesosphere/kommander-applications/apptests/environment"
 )
@@ -59,17 +62,32 @@ func (r kubeCost) Upgrade(ctx context.Context, env *environment.Env) error {
 }
 
 func (r kubeCost) install(ctx context.Context, env *environment.Env, appPath string) error {
+	_, err := env.K8sClient.Clientset().CoreV1().Namespaces().Create(ctx, &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{Name: "kubecost"},
+	}, metav1.CreateOptions{})
+	if err != nil {
+		return err
+	}
 	// apply defaults configmaps first
 	defaultKustomization := filepath.Join(appPath, "/defaults")
-	err := env.ApplyKustomizations(ctx, defaultKustomization, map[string]string{
+	err = env.ApplyKustomizations(ctx, defaultKustomization, map[string]string{
+		"releaseNamespace": kommanderNamespace,
+	})
+	if err != nil {
+		return err
+	}
+
+	// apply the kustomization for the prereqs
+	prereqs := filepath.Join(appPath, "/pre-install")
+	err = env.ApplyKustomizations(ctx, prereqs, map[string]string{
 		"releaseNamespace": kommanderNamespace,
 	})
 	if err != nil {
 		return err
 	}
 
 	// apply the kustomization for the helmrelease
-	releasePath := filepath.Join(appPath, "/")
+	releasePath := filepath.Join(appPath, "/release")
 	err = env.ApplyKustomizations(ctx, releasePath, map[string]string{
 		"releaseNamespace": kommanderNamespace,
 	})

apptests/appscenarios/kubecost_test.go

@@ -91,11 +91,16 @@ var _ = Describe("Kubecost Tests", Label("kubecost"), func() {
 			deploymentList = &appsv1.DeploymentList{}
 			err = k8sClient.List(ctx, deploymentList, listOptions)
 			Expect(err).To(BeNil())
-			Expect(deploymentList.Items).To(HaveLen(4))
+			Expect(deploymentList.Items).To(HaveLen(4), "Expected 4 deployments to be created - cost-analyzer, grafana, prometheus server and prometheus alertmanager")
 			Expect(err).To(BeNil())
 
 			for _, deployment := range deploymentList.Items {
-				Expect(deployment.Spec.Template.Spec.PriorityClassName).To(Equal(dkpHighPriority))
+				Expect(deployment.Spec.Template.Spec.PriorityClassName).To(
+					Equal(dkpHighPriority),
+					"Deployment %q had an unexpected PriorityClass %q",
+					deployment.Name,
+					deployment.Spec.Template.Spec.PriorityClassName,
+				)
 			}
 		})