Increase default kube_cache_sync_timeout_seconds from 5 to 10 seconds (…

…DataDog#31877)
kkpan11 · Dec 10, 2024 · 4f89621 · 4f89621
1 parent 7c1a13b
commit 4f89621
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/flakes.yaml b/flakes.yaml
@@ -11,3 +11,5 @@ test/new-e2e/tests/containers:
   - TestECSSuite/TestCPU/metric___container.cpu.usage{^ecs_container_name:stress-ng$}
   - TestEKSSuite/TestCPU/metric___container.cpu.usage{^kube_deployment:stress-ng$,^kube_namespace:workload-cpustress$}
   - TestKindSuite/TestCPU/metric___container.cpu.usage{^kube_deployment:stress-ng$,^kube_namespace:workload-cpustress$}
+  - TestKindSuite/TestAdmissionControllerWithAutoDetectedLanguage
+  - TestKindSuite
diff --git a/pkg/config/setup/config.go b/pkg/config/setup/config.go
@@ -490,7 +490,7 @@ func InitConfig(config pkgconfigmodel.Setup) {
 	config.BindEnvAndSetDefault("leader_election_default_resource", "configmap")
 	config.BindEnvAndSetDefault("leader_election_release_on_shutdown", true)
 	config.BindEnvAndSetDefault("kube_resources_namespace", "")
-	config.BindEnvAndSetDefault("kube_cache_sync_timeout_seconds", 5)
+	config.BindEnvAndSetDefault("kube_cache_sync_timeout_seconds", 10)
 
 	// Datadog cluster agent
 	config.BindEnvAndSetDefault("cluster_agent.enabled", false)

diff --git a/test/new-e2e/tests/containers/dump_cluster_state.go b/test/new-e2e/tests/containers/dump_cluster_state.go
@@ -17,7 +17,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/DataDog/datadog-agent/pkg/util/pointer"
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	awsec2 "github.com/aws/aws-sdk-go-v2/service/ec2"
 	awsec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
@@ -34,6 +33,8 @@ import (
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	kubectlget "k8s.io/kubectl/pkg/cmd/get"
 	kubectlutil "k8s.io/kubectl/pkg/cmd/util"
+
+	"github.com/DataDog/datadog-agent/pkg/util/pointer"
 )
 
 func dumpEKSClusterState(ctx context.Context, name string) (ret string) {
@@ -287,7 +288,7 @@ func dumpK8sClusterState(ctx context.Context, kubeconfig *clientcmdapi.Config, o
 	getCmd.SetErr(out)
 	getCmd.SetContext(ctx)
 	getCmd.SetArgs([]string{
-		"nodes,all",
+		"nodes,mutatingwebhookconfiguration,validatingwebhookconfiguration,all",
 		"--all-namespaces",
 		"-o",
 		"wide",

diff --git a/test/new-e2e/tests/containers/k8s_test.go b/test/new-e2e/tests/containers/k8s_test.go
@@ -19,7 +19,6 @@ import (
 	"gopkg.in/zorkian/go-datadog-api.v2"
 
 	"github.com/DataDog/datadog-agent/pkg/util/pointer"
-	"github.com/DataDog/datadog-agent/pkg/util/testutil/flake"
 	"github.com/DataDog/datadog-agent/test/fakeintake/aggregator"
 	fakeintake "github.com/DataDog/datadog-agent/test/fakeintake/client"
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/components"
@@ -993,8 +992,6 @@ func (suite *k8sSuite) TestAdmissionControllerWithLibraryAnnotation() {
 }
 
 func (suite *k8sSuite) TestAdmissionControllerWithAutoDetectedLanguage() {
-	// CONTINT-4009
-	flake.Mark(suite.T())
 	suite.testAdmissionControllerPod("workload-mutated-lib-injection", "mutated-with-auto-detected-language", "python", true)
 }
 

diff --git a/test/new-e2e/tests/containers/kindvm_test.go b/test/new-e2e/tests/containers/kindvm_test.go
@@ -10,8 +10,6 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/DataDog/datadog-agent/pkg/util/testutil/flake"
-
 	"github.com/DataDog/test-infra-definitions/scenarios/aws/kindvm"
 
 	"github.com/DataDog/datadog-agent/test/new-e2e/pkg/components"
@@ -28,7 +26,6 @@ type kindSuite struct {
 }
 
 func TestKindSuite(t *testing.T) {
-	flake.Mark(t)
 	suite.Run(t, &kindSuite{})
 }