From 00d2a17b2adceaf5c8324320029cdb75e955f33d Mon Sep 17 00:00:00 2001
From: "Wilson E. Husin" <wilsonehusin@gmail.com>
Date: Tue, 9 Mar 2021 13:29:15 -0800
Subject: [PATCH] Use kubeconformance binary, deprecate gorunner and run_e2e

Actual name change will take place later as it involves changes to test-infra and other repositories
---
 cluster/images/conformance/Dockerfile                    | 9 ++++++---
 .../conformance/go-runner/{e2erunner.go => main.go}      | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename cluster/images/conformance/go-runner/{e2erunner.go => main.go} (94%)

diff --git a/cluster/images/conformance/Dockerfile b/cluster/images/conformance/Dockerfile
index 7172005dbce..0d97e1fdd9e 100644
--- a/cluster/images/conformance/Dockerfile
+++ b/cluster/images/conformance/Dockerfile
@@ -21,12 +21,15 @@ FROM ${BASEIMAGE}
 # This is a dependency for `kubectl diff` tests
 COPY --from=base /usr/bin/diff /usr/local/bin/
 
+COPY cluster /kubernetes/cluster
 COPY ginkgo /usr/local/bin/
 COPY e2e.test /usr/local/bin/
 COPY kubectl /usr/local/bin/
-COPY gorunner /usr/local/bin/
+COPY gorunner /usr/local/bin/kubeconformance
+
+# Legacy executables -- deprecated
+COPY gorunner /run_e2e.sh
 COPY gorunner /gorunner
-COPY cluster /kubernetes/cluster
 
 ENV E2E_FOCUS="\[Conformance\]"
 ENV E2E_SKIP=""
@@ -36,4 +39,4 @@ ENV E2E_VERBOSITY="4"
 ENV RESULTS_DIR="/tmp/results"
 ENV KUBECONFIG=""
 
-ENTRYPOINT [ "/gorunner" ]
+ENTRYPOINT [ "kubeconformance" ]
diff --git a/cluster/images/conformance/go-runner/e2erunner.go b/cluster/images/conformance/go-runner/main.go
similarity index 94%
rename from cluster/images/conformance/go-runner/e2erunner.go
rename to cluster/images/conformance/go-runner/main.go
index 073b3159c0f..22fb0246676 100644
--- a/cluster/images/conformance/go-runner/e2erunner.go
+++ b/cluster/images/conformance/go-runner/main.go
@@ -23,11 +23,15 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	"strings"
 
 	"github.com/pkg/errors"
 )
 
 func main() {
+	if strings.Contains(os.Args[0], "run_e2e.sh") || strings.Contains(os.Args[0], "gorunner") {
+		log.Print("warn: calling test with e2e.test is deprecated, please rely on container manifest to invoke executable")
+	}
 	env := envWithDefaults(map[string]string{
 		resultsDirEnvKey: defaultResultsDir,
 		skipEnvKey:       defaultSkip,