From 773b3e4574ac1473cf0448df088c0d40f2b47d37 Mon Sep 17 00:00:00 2001
From: Maciej Szulik <maszulik@redhat.com>
Date: Wed, 21 Jul 2021 10:37:40 +0200
Subject: [PATCH] UPSTREAM: <carry>: export HandleFlags

OpenShift-Rebase-Source: 7bf2f1f71c0
---
 test/e2e/e2e_test.go  | 11 +----------
 test/e2e/patch_e2e.go | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 test/e2e/patch_e2e.go

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 1b124cc831f15..bcf7e4fa5d2bf 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -38,7 +38,6 @@ import (
 	"k8s.io/klog/v2"
 	conformancetestdata "k8s.io/kubernetes/test/conformance/testdata"
 	"k8s.io/kubernetes/test/e2e/framework"
-	"k8s.io/kubernetes/test/e2e/framework/config"
 	"k8s.io/kubernetes/test/e2e/framework/testfiles"
 	e2etestingmanifests "k8s.io/kubernetes/test/e2e/testing-manifests"
 	testfixtures "k8s.io/kubernetes/test/fixtures"
@@ -71,20 +70,12 @@ import (
 	_ "k8s.io/kubernetes/test/utils/format"
 )
 
-// handleFlags sets up all flags and parses the command line.
-func handleFlags() {
-	config.CopyFlags(config.Flags, flag.CommandLine)
-	framework.RegisterCommonFlags(flag.CommandLine)
-	framework.RegisterClusterFlags(flag.CommandLine)
-	flag.Parse()
-}
-
 func TestMain(m *testing.M) {
 	var versionFlag bool
 	flag.CommandLine.BoolVar(&versionFlag, "version", false, "Displays version information.")
 
 	// Register test flags, then parse flags.
-	handleFlags()
+	HandleFlags()
 
 	if framework.TestContext.ListImages {
 		for _, v := range image.GetImageConfigs() {
diff --git a/test/e2e/patch_e2e.go b/test/e2e/patch_e2e.go
new file mode 100644
index 0000000000000..c0aecd32cda2c
--- /dev/null
+++ b/test/e2e/patch_e2e.go
@@ -0,0 +1,15 @@
+package e2e
+
+import (
+	"flag"
+
+	"k8s.io/kubernetes/test/e2e/framework"
+	"k8s.io/kubernetes/test/e2e/framework/config"
+)
+
+func HandleFlags() {
+	config.CopyFlags(config.Flags, flag.CommandLine)
+	framework.RegisterCommonFlags(flag.CommandLine)
+	framework.RegisterClusterFlags(flag.CommandLine)
+	flag.Parse()
+}