Merge pull request #1648 from gruntwork-io/fix/helm-test-failures

Update bitnami/nginx chart version in helm tests

Author: james00012

modules/helm/install_test.go

@@ -29,7 +29,7 @@ import (
 const (
 	remoteChartSource  = "https://charts.bitnami.com/bitnami"
 	remoteChartName    = "nginx"
-	remoteChartVersion = "13.2.23"
+	remoteChartVersion = "22.4.0"
 )
 
 // Test that we can install a remote chart (e.g bitnami/nginx)
@@ -48,11 +48,13 @@ func TestRemoteChartInstall(t *testing.T) {
 	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
 	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
 
-	// Override service type to node port
+	// Override service type to node port and disable PDB (requires policy/v1 API
+	// which may not be available on older k8s clusters)
 	options := &Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
 			"service.type": "NodePort",
+			"pdb.create":   "false",
 		},
 		Version: remoteChartVersion,
 	}
@@ -160,9 +162,11 @@ func waitForRemoteChartPods(t *testing.T, kubectlOptions *k8s.KubectlOptions, re
 			remoteChartName, releaseName,
 		),
 	}
-	k8s.WaitUntilNumPodsCreated(t, kubectlOptions, filters, podCount, 30, 10*time.Second)
+	// Use longer timeout (60 retries * 10s = 10 min) to handle slower CI environments
+	// and potential resource contention when multiple helm tests run in parallel
+	k8s.WaitUntilNumPodsCreated(t, kubectlOptions, filters, podCount, 60, 10*time.Second)
 	pods := k8s.ListPods(t, kubectlOptions, filters)
 	for _, pod := range pods {
-		k8s.WaitUntilPodAvailable(t, kubectlOptions, pod.Name, 30, 10*time.Second)
+		k8s.WaitUntilPodAvailable(t, kubectlOptions, pod.Name, 60, 10*time.Second)
 	}
 }

modules/helm/upgrade_test.go

@@ -40,11 +40,13 @@ func TestRemoteChartInstallUpgradeRollback(t *testing.T) {
 	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
 	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
 
-	// Override service type to node port
+	// Override service type to node port and disable PDB (requires policy/v1 API
+	// which may not be available on older k8s clusters)
 	options := &Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
 			"service.type": "NodePort",
+			"pdb.create":   "false",
 		},
 		Version: remoteChartVersion,
 	}
@@ -69,6 +71,7 @@ func TestRemoteChartInstallUpgradeRollback(t *testing.T) {
 	options.SetValues = map[string]string{
 		"replicaCount": "2",
 		"service.type": "NodePort",
+		"pdb.create":   "false",
 	}
 	// Test that passing extra arguments doesn't error, by changing default timeout
 	options.ExtraArgs = map[string][]string{"upgrade": []string{"--timeout", "5m1s"}}

test/helm_keda_remote_example_template_snapshot_test.go

@@ -173,5 +173,6 @@ func TestHelmKedaRemoteExampleTemplateRenderedPackageDiff(t *testing.T) {
 	output := helm.RenderRemoteTemplate(t, options, "https://kedacore.github.io/charts", releaseName, []string{})
 
 	// run the diff and assert the number of diffs matches the number of diffs in the snapshot
-	require.Equal(t, 24, helm.DiffAgainstSnapshot(t, options, output, releaseName))
+	// (namespace diffs + intentional value changes for replicas/memory)
+	require.Equal(t, 27, helm.DiffAgainstSnapshot(t, options, output, releaseName))
 }