Fix impersonation requests and update Makefile

Signed-off-by: JoshVanL <[email protected]>

Author: JoshVanL

Makefile

@@ -74,6 +74,7 @@ clean: ## clean up created files
 	rm -rf \
 		$(BINDIR) \
 		pkg/mocks/authenticator.go \
+		demo/bin \
 		test/e2e/framework/issuer/bin
 
 verify: depend verify_boilerplate go_fmt go_vet go_lint ## verify code and mod
@@ -87,21 +88,6 @@ test: generate verify ## run all go tests
 e2e: ## run end to end tests
 	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go test -timeout 30m -v ./test/e2e/suite/.
 
-#e2e-1.15: build ## run end to end tests for kubernetes version 1.15
-#	KUBE_OIDC_PROXY_NODE_IMAGE=1.15.0 go test ./pkg/e2e/. -v --count=1
-#
-#e2e-1.14: build ## run end to end tests for kubernetes version 1.14
-#	KUBE_OIDC_PROXY_NODE_IMAGE=1.14.3 go test ./pkg/e2e/. -v --count=1
-#
-#e2e-1.13: build ## run end to end tests for kubernetes version 1.13
-#	KUBE_OIDC_PROXY_NODE_IMAGE=1.13.7 go test ./pkg/e2e/. -v --count=1
-#
-#e2e-1.12: build ## run end to end tests for kubernetes version 1.12
-#	KUBE_OIDC_PROXY_NODE_IMAGE=1.12.8 go test ./pkg/e2e/. -v --count=1
-#
-#e2e-1.11: build ## run end to end tests for kubernetes version 1.11
-#	KUBE_OIDC_PROXY_NODE_IMAGE=1.11.10 go test ./pkg/e2e/. -v --count=1
-
 build: generate ## build kube-oidc-proxy
 	CGO_ENABLED=0 go build -ldflags '-w $(shell hack/version-ldflags.sh)' -o ./bin/kube-oidc-proxy ./cmd/.
 

test/e2e/suite/cases/impersonation/impersonation.go

@@ -22,7 +22,7 @@ var _ = framework.CasesDescribe("Impersonation", func() {
 	It("should error at proxy when impersonation enabled and impersonation is attempted on a request", func() {
 		By("Impersonating as a user")
 		tryImpersonationClient(f, rest.ImpersonationConfig{
-			UserName: "user@example.com",
+			UserName: "foo@example.com",
 		})
 
 		By("Impersonating as a group")
@@ -90,13 +90,13 @@ func tryImpersonationClient(f *framework.Framework, impConfig rest.Impersonation
 		Expect(err).NotTo(HaveOccurred())
 	}
 
-	expRespBody := "Impersonation requests are disabled when using kube-oidc-proxy (get pods)"
+	expRespBody := "Impersonation requests are disabled when using kube-oidc-proxy"
 	resp := kErr.Status().Details.Causes[0].Message
 
 	// check body and status code the token was rejected
 	if int(kErr.Status().Code) != http.StatusForbidden ||
 		resp != expRespBody {
-		Expect(fmt.Errorf("expected status code %d with body %q, got= %+v",
+		Expect(fmt.Errorf("expected status code %d with body %q, got=%s",
 			http.StatusForbidden, expRespBody, kErr)).NotTo(HaveOccurred())
 	}
 }