From b33cd86a27be09d5998fd35134813b50955b5550 Mon Sep 17 00:00:00 2001 From: Michael Taufen Date: Mon, 3 May 2021 14:23:43 -0700 Subject: [PATCH] Update tests to use agnhost 2.32 Updates e2e tests to use agnhost 2.32, which fixes an issue with the conformance tests for ServiceAccountIssuerDiscovery. Original fix: https://github.com/kubernetes/kubernetes/pull/101589 Image promotion: https://github.com/kubernetes/k8s.io/pull/1994 --- build/dependencies.yaml | 2 +- test/e2e/auth/service_accounts.go | 1 - test/utils/image/manifest.go | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 23ff7b66390..e81ddf66255 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -27,7 +27,7 @@ dependencies: # then after merge and successful postsubmit image push / promotion, bump this - name: "agnhost: dependents" - version: "2.31" + version: "2.32" refPaths: - path: test/utils/image/manifest.go match: configs\[Agnhost\] = Config{promoterE2eRegistry, "agnhost", "\d+\.\d+"} diff --git a/test/e2e/auth/service_accounts.go b/test/e2e/auth/service_accounts.go index f6825b77c2e..2dbfb78dea4 100644 --- a/test/e2e/auth/service_accounts.go +++ b/test/e2e/auth/service_accounts.go @@ -735,7 +735,6 @@ var _ = SIGDescribe("ServiceAccounts", func() { Image: imageutils.GetE2EImage(imageutils.Agnhost), Args: []string{ "test-service-account-issuer-discovery", - "--in-cluster-discovery", "--token-path", path.Join(tokenPath, tokenName), "--audience", audience, }, diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index a8f60a8de85..66348582dd5 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -213,7 +213,7 @@ const ( func initImageConfigs() (map[int]Config, map[int]Config) { configs := map[int]Config{} - configs[Agnhost] = Config{promoterE2eRegistry, "agnhost", "2.31"} + configs[Agnhost] = Config{promoterE2eRegistry, "agnhost", "2.32"} configs[AgnhostPrivate] = Config{PrivateRegistry, "agnhost", "2.6"} configs[AuthenticatedAlpine] = Config{gcAuthenticatedRegistry, "alpine", "3.7"} configs[AuthenticatedWindowsNanoServer] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"}