diff --git a/src/api/v1beta1/dynakube/feature_flags.go b/src/api/v1beta1/dynakube/feature_flags.go index d6f1deb43e..ef80fa86a0 100644 --- 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 index 4302e33f11..dc3417903a 100644 --- 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 index e56ee65514..54f2ac4639 100644 --- 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