Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Fix TestOverrideReconcilerResources on Autopilot #485

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] Fix TestOverrideReconcilerResources on Autopilot #485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 24 additions & 6 deletions e2e/testcases/override_resource_limits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down