From 2278c0199324df510c62d8b11b7c445f2946e573 Mon Sep 17 00:00:00 2001 From: Karl Isenberg Date: Wed, 22 Mar 2023 18:14:18 -0700 Subject: [PATCH] Fix TestOverrideReconcilerResources on Autopilot --- .../override_resource_limits_test.go | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/e2e/testcases/override_resource_limits_test.go b/e2e/testcases/override_resource_limits_test.go index 27aca34a98..de8b4da425 100644 --- a/e2e/testcases/override_resource_limits_test.go +++ b/e2e/testcases/override_resource_limits_test.go @@ -67,19 +67,37 @@ func defaultResourceRequestsLimits(nt *nomostest.NT) (reconcilerRequests, reconc } } if container.Name == reconcilermanager.Reconciler { - reconcilerRequests = container.Resources.Requests - reconcilerLimits = container.Resources.Limits + reconcilerRequests = container.Resources.Requests.DeepCopy() + reconcilerLimits = container.Resources.Limits.DeepCopy() + if nt.IsGKEAutopilot { + // Autopilot sets limit to request, if not set. + if reconcilerLimits.Cpu().IsZero() { + reconcilerLimits[corev1.ResourceCPU] = reconcilerRequests[corev1.ResourceCPU] + } + if reconcilerLimits.Memory().IsZero() { + reconcilerLimits[corev1.ResourceMemory] = reconcilerRequests[corev1.ResourceMemory] + } + } } if container.Name == reconcilermanager.GitSync { - gitSyncRequests = container.Resources.Requests - gitSyncLimits = container.Resources.Limits + gitSyncRequests = container.Resources.Requests.DeepCopy() + gitSyncLimits = container.Resources.Limits.DeepCopy() + if nt.IsGKEAutopilot { + // Autopilot sets limit to request, if not set. + if gitSyncLimits.Cpu().IsZero() { + gitSyncLimits[corev1.ResourceCPU] = gitSyncRequests[corev1.ResourceCPU] + } + if reconcilerLimits.Memory().IsZero() { + gitSyncLimits[corev1.ResourceMemory] = gitSyncRequests[corev1.ResourceMemory] + } + } } } return } func TestOverrideReconcilerResourcesV1Alpha1(t *testing.T) { - nt := nomostest.New(t, nomostesting.OverrideAPI, ntopts.SkipAutopilotCluster, + nt := nomostest.New(t, nomostesting.OverrideAPI, ntopts.NamespaceRepo(backendNamespace, configsync.RepoSyncName), ntopts.NamespaceRepo(frontendNamespace, configsync.RepoSyncName)) if err := nt.WatchForAllSyncs(); err != nil { @@ -382,7 +400,7 @@ func TestOverrideReconcilerResourcesV1Alpha1(t *testing.T) { } func TestOverrideReconcilerResourcesV1Beta1(t *testing.T) { - nt := nomostest.New(t, nomostesting.OverrideAPI, ntopts.SkipAutopilotCluster, + nt := nomostest.New(t, nomostesting.OverrideAPI, ntopts.NamespaceRepo(backendNamespace, configsync.RepoSyncName), ntopts.NamespaceRepo(frontendNamespace, configsync.RepoSyncName)) if err := nt.WatchForAllSyncs(); err != nil {