[chore] Fix chart waiting for deployments in tests (#1734)

Use chart "wait" feature instead of custom logic

Author: dmitryax

functional_tests/configuration_switching/configuration_switching_test.go

@@ -41,10 +41,6 @@ type sinks struct {
 func deployChartsAndApps(t *testing.T, valuesFileName string, repl map[string]interface{}) {
 	testKubeConfig, setKubeConfig := os.LookupEnv("KUBECONFIG")
 	require.True(t, setKubeConfig, "the environment variable KUBECONFIG must be set")
-	kubeConfig, err := clientcmd.BuildConfigFromFlags("", testKubeConfig)
-	require.NoError(t, err)
-	client, err := kubernetes.NewForConfig(kubeConfig)
-	require.NoError(t, err)
 
 	hostEp := internal.HostEndpoint(t)
 	if len(hostEp) == 0 {
@@ -61,7 +57,6 @@ func deployChartsAndApps(t *testing.T, valuesFileName string, repl map[string]in
 	valuesFile, err := filepath.Abs(filepath.Join(testDir, valuesDir, valuesFileName))
 	require.NoError(t, err)
 	internal.ChartInstallOrUpgrade(t, testKubeConfig, valuesFile, replacements)
-	internal.WaitForAllDeploymentsToStart(t, client)
 
 	t.Cleanup(func() {
 		if os.Getenv("SKIP_TEARDOWN") == "true" {

functional_tests/functional/functional_test.go

@@ -194,7 +194,6 @@ func deployChartsAndApps(t *testing.T, testKubeConfig string) {
 		"KubeTestEnv":           kubeTestEnv,
 	}
 	internal.ChartInstallOrUpgrade(t, testKubeConfig, valuesFile, replacements)
-	internal.WaitForAllDeploymentsToStart(t, client)
 
 	deployments := client.AppsV1().Deployments(internal.Namespace)
 
@@ -340,8 +339,6 @@ func deployChartsAndApps(t *testing.T, testKubeConfig string) {
 		}
 	}
 
-	internal.WaitForAllDeploymentsToStart(t, client)
-
 	t.Cleanup(func() {
 		if os.Getenv("SKIP_TEARDOWN") == "true" {
 			t.Log("Skipping teardown as SKIP_TEARDOWN is set to true")

functional_tests/internal/chart.go

@@ -46,6 +46,7 @@ func ChartInstallOrUpgrade(t *testing.T, testKubeConfig string, valuesFile strin
 	install := action.NewInstall(actionConfig)
 	install.Namespace = Namespace
 	install.ReleaseName = chartReleaseName
+	install.Wait = true
 	install.Timeout = helmActionTimeout
 
 	// If UPGRADE_FROM_VALUES env var is set, we install the helm chart using the values. Otherwise, run helm install.
@@ -66,7 +67,7 @@ func ChartInstallOrUpgrade(t *testing.T, testKubeConfig string, valuesFile strin
 		// test the upgrade
 		upgrade := action.NewUpgrade(actionConfig)
 		upgrade.Namespace = Namespace
-		upgrade.Install = true
+		upgrade.Wait = true
 		upgrade.Timeout = helmActionTimeout
 		t.Log("Running helm upgrade")
 		_, err = upgrade.Run(chartReleaseName, loadChart(t), values)

functional_tests/internal/common.go

@@ -178,23 +178,3 @@ func AnnotateNamespace(t *testing.T, clientset *kubernetes.Clientset, name, key,
 	_, err = clientset.CoreV1().Namespaces().Update(context.TODO(), ns, metav1.UpdateOptions{})
 	require.NoError(t, err)
 }
-
-func WaitForAllDeploymentsToStart(t *testing.T, client *kubernetes.Clientset) {
-	require.Eventually(t, func() bool {
-		di, err := client.AppsV1().Deployments(Namespace).List(context.Background(), metav1.ListOptions{})
-		require.NoError(t, err)
-		for _, d := range di.Items {
-			if d.Status.ReadyReplicas != d.Status.Replicas {
-				var messages string
-				for _, c := range d.Status.Conditions {
-					messages += c.Message
-					messages += "\n"
-				}
-
-				t.Logf("Deployment not ready: %s, %s", d.Name, messages)
-				return false
-			}
-		}
-		return true
-	}, 10*time.Minute, 10*time.Second)
-}