Add gke-autopilot namespaces to default ignored namespaces (#2098)

* Add gke namespaces to ignored namespaces to fix e2e tests * Extract timeout to constant * Update test/helpers/kubeobjects/deployment/wait.go Co-authored-by: Andrii Soldatenko <[email protected]> * Update test/helpers/kubeobjects/deployment/wait.go Co-authored-by: Andrii Soldatenko <[email protected]> * Fix linting --------- Co-authored-by: Andrii Soldatenko <[email protected]>
Dynatrace · Sep 8, 2023 · f2b7831 · f2b7831
1 parent 1b2fbda
commit f2b7831
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/api/v1beta1/dynakube/feature_flags.go b/src/api/v1beta1/dynakube/feature_flags.go
@@ -218,6 +218,8 @@ func (dk *DynaKube) getDefaultIgnoredNamespaces() []string {
 		fmt.Sprintf("^%s$", dk.Namespace),
 		"^kube-.*",
 		"^openshift(-.*)?",
+		"^gke-.*",
+		"^gmp-.*",
 	}
 	return defaultIgnoredNamespaces
 }

diff --git a/test/helpers/kubeobjects/deployment/wait.go b/test/helpers/kubeobjects/deployment/wait.go
@@ -5,6 +5,7 @@ package deployment
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
@@ -17,6 +18,8 @@ import (
 	"sigs.k8s.io/e2e-framework/pkg/features"
 )
 
+const DeploymentAvailableTimeout = 15 * time.Minute
+
 func WaitFor(name string, namespace string) features.Func {
 	return func(ctx context.Context, t *testing.T, envConfig *envconf.Config) context.Context {
 		resources := envConfig.Client().Resources()
@@ -34,5 +37,5 @@ func WaitFor(name string, namespace string) features.Func {
 }
 
 func WaitUntilReady(resource *resources.Resources, deployment *appsv1.Deployment) error {
-	return wait.For(conditions.New(resource).DeploymentConditionMatch(deployment, appsv1.DeploymentAvailable, corev1.ConditionTrue))
+	return wait.For(conditions.New(resource).DeploymentConditionMatch(deployment, appsv1.DeploymentAvailable, corev1.ConditionTrue), wait.WithTimeout(DeploymentAvailableTimeout))
 }
diff --git a/test/testdata/sample-app/pod-base.yaml b/test/testdata/sample-app/pod-base.yaml
@@ -33,8 +33,10 @@ spec:
       resources:
         requests:
           memory: 64Mi
+          ephemeral-storage: 2Gi
         limits:
           memory: 128Mi
+          ephemeral-storage: 2Gi
   restartPolicy: Always
   tolerations:
     - key: kubernetes.io/arch