Skip to content

Commit 1f21f2e

Browse files
authored
test: fix tests failing with SSM gitprovider (#1804)
1 parent 5981018 commit 1f21f2e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

e2e/testcases/multi_sync_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ func TestMultiSyncs_Unstructured_MixedControl(t *testing.T) {
224224

225225
// Reconciler-manager doesn't copy the secret of RootSync's secretRef.
226226
validateReconcilerResource(nt, kinds.Secret(), map[string]string{metadata.SyncNamespaceLabel: configsync.ControllerNamespace}, 0)
227-
// CSR auth type doesn't need to copy the secret
228-
if nt.GitProvider.Type() != e2e.CSR {
227+
// CSR and SSM auth type doesn't need to copy the secret
228+
if nt.GitProvider.Type() != e2e.CSR && nt.GitProvider.Type() != e2e.SSM {
229229
validateReconcilerResource(nt, kinds.Secret(), map[string]string{metadata.SyncNamespaceLabel: testNs}, 5)
230230
validateReconcilerResource(nt, kinds.Secret(), map[string]string{metadata.SyncNamespaceLabel: testNs2}, 1)
231231
validateReconcilerResource(nt, kinds.Secret(), map[string]string{metadata.SyncNameLabel: repoSync1ID.Name}, 2)

e2e/testcases/reconciler_manager_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ func validateRepoSyncDependencies(nt *nomostest.NT, ns, rsName string) []client.
444444
repoSyncDependencies = append(repoSyncDependencies, repoSyncSA)
445445

446446
// See nomostest.CreateNamespaceSecrets for creation of user secrets.
447-
// The Secret is neither needed nor created when using CSR as the Git provider.
448-
if nt.GitProvider.Type() != e2e.CSR {
447+
// The Secret is neither needed nor created when using CSR or SSM as the Git provider.
448+
if nt.GitProvider.Type() != e2e.CSR && nt.GitProvider.Type() != e2e.SSM {
449449
repoSyncAuthSecret := &corev1.Secret{}
450450
setNN(repoSyncAuthSecret, client.ObjectKey{
451451
Name: controllers.ReconcilerResourceName(repoSyncReconciler.Name, nomostest.NamespaceAuthSecretName),
@@ -941,7 +941,7 @@ func TestAutopilotReconcilerAdjustment(t *testing.T) {
941941
}
942942
// Filter container map down to just expected containers
943943
filteredContainers := []string{reconcilermanager.Reconciler, reconcilermanager.GitSync, metrics.OtelAgentName}
944-
if nt.GitProvider.Type() == e2e.CSR {
944+
if nt.GitProvider.Type() == e2e.CSR || nt.GitProvider.Type() == e2e.SSM {
945945
filteredContainers = append(filteredContainers, reconcilermanager.GCENodeAskpassSidecar)
946946
}
947947
expectedResources = filterResourceMap(expectedResources, filteredContainers...)

0 commit comments

Comments
 (0)