From 788479b7b0a46b674cbd79dea6831e2a85ee4378 Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Tue, 29 Sep 2020 12:41:42 -0700 Subject: [PATCH] Fix upgrade test (#5021) A conflict between #4911 and #4737 caused unit test to be broken. #4737 added a new test to `upgrade_test.go` and the changes in #4911 updated all of these test to ignore differences in the config overrides secret. Since these two PRs merged in parallel, the new test was missing this update. Update the new test to also ignore differences in the config overrides secret as the other ones do. Signed-off-by: Alex Leong --- cli/cmd/upgrade_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cli/cmd/upgrade_test.go b/cli/cmd/upgrade_test.go index 871ed10de..434fa5c56 100644 --- a/cli/cmd/upgrade_test.go +++ b/cli/cmd/upgrade_test.go @@ -390,6 +390,9 @@ func TestUpgradeWebhookCrtsNameChange(t *testing.T) { expectedManifests := parseManifestList(expected) upgradeManifests := parseManifestList(upgrade.String()) for id, diffs := range diffManifestLists(expectedManifests, upgradeManifests) { + if id == overridesSecret { + continue + } for _, diff := range diffs { t.Errorf("Unexpected diff in %s:\n%s", id, diff.String()) }