From 7e35bdbad5a8a16b54d37f50a6a798c58df6be49 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Wed, 22 Nov 2023 22:11:06 -0800 Subject: [PATCH 01/15] keep resource group --- test/e2e/setup.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/e2e/setup.go b/test/e2e/setup.go index ded80fd8326..bf52e317d24 100644 --- a/test/e2e/setup.go +++ b/test/e2e/setup.go @@ -436,7 +436,7 @@ func done(ctx context.Context) error { } var _ = BeforeSuite(func() { - log.Info("BeforeSuite") + log.Info("BeforeSuite chiac") SetDefaultEventuallyTimeout(DefaultEventuallyTimeout) SetDefaultEventuallyPollingInterval(10 * time.Second) @@ -450,12 +450,12 @@ var _ = BeforeSuite(func() { }) var _ = AfterSuite(func() { - log.Info("AfterSuite") - - if err := done(context.Background()); err != nil { - if oDataError, ok := err.(msgraph_errors.ODataErrorable); ok { - spew.Dump(oDataError.GetErrorEscaped()) - } - panic(err) - } + log.Info("AfterSuite chiac") + + // if err := done(context.Background()); err != nil { + // if oDataError, ok := err.(msgraph_errors.ODataErrorable); ok { + // spew.Dump(oDataError.GetErrorEscaped()) + // } + // panic(err) + // } }) From de8c5a4db088cf707eb145fe3a14a5aade377d95 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Thu, 23 Nov 2023 01:38:52 -0800 Subject: [PATCH 02/15] e2e only --- test/e2e/setup.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/e2e/setup.go b/test/e2e/setup.go index bf52e317d24..af13a6d0b51 100644 --- a/test/e2e/setup.go +++ b/test/e2e/setup.go @@ -396,17 +396,17 @@ func setup(ctx context.Context) error { osClusterVersion = os.Getenv("OS_CLUSTER_VERSION") - if os.Getenv("CI") != "" { // always create cluster in CI - cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") - if err != nil { - return err - } + // if os.Getenv("CI") != "" { // always create cluster in CI + // cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") + // if err != nil { + // return err + // } - err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) - if err != nil { - return err - } - } + // err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) + // if err != nil { + // return err + // } + // } clusterResourceID = resourceIDFromEnv() @@ -436,7 +436,7 @@ func done(ctx context.Context) error { } var _ = BeforeSuite(func() { - log.Info("BeforeSuite chiac") + log.Info("BeforeSuite e2e only") SetDefaultEventuallyTimeout(DefaultEventuallyTimeout) SetDefaultEventuallyPollingInterval(10 * time.Second) @@ -450,7 +450,7 @@ var _ = BeforeSuite(func() { }) var _ = AfterSuite(func() { - log.Info("AfterSuite chiac") + log.Info("AfterSuite e2e only") // if err := done(context.Background()); err != nil { // if oDataError, ok := err.(msgraph_errors.ODataErrorable); ok { From 5d424ddffe6617fdd1886402b6d7fadb93930bd4 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Tue, 28 Nov 2023 11:18:25 -0800 Subject: [PATCH 03/15] keep resources --- test/e2e/setup.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/e2e/setup.go b/test/e2e/setup.go index af13a6d0b51..fc45124c805 100644 --- a/test/e2e/setup.go +++ b/test/e2e/setup.go @@ -396,17 +396,17 @@ func setup(ctx context.Context) error { osClusterVersion = os.Getenv("OS_CLUSTER_VERSION") - // if os.Getenv("CI") != "" { // always create cluster in CI - // cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") - // if err != nil { - // return err - // } + if os.Getenv("CI") != "" { // always create cluster in CI + cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") + if err != nil { + return err + } - // err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) - // if err != nil { - // return err - // } - // } + err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) + if err != nil { + return err + } + } clusterResourceID = resourceIDFromEnv() From 151cf2521aa6fb97722a1936a5d730b2eca5fafe Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Tue, 28 Nov 2023 16:30:36 -0800 Subject: [PATCH 04/15] don't create cluster --- test/e2e/setup.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/e2e/setup.go b/test/e2e/setup.go index fc45124c805..c0f16b25811 100644 --- a/test/e2e/setup.go +++ b/test/e2e/setup.go @@ -396,17 +396,17 @@ func setup(ctx context.Context) error { osClusterVersion = os.Getenv("OS_CLUSTER_VERSION") - if os.Getenv("CI") != "" { // always create cluster in CI - cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") - if err != nil { - return err - } + // if os.Getenv("CI") != "" { // always create cluster in CI + // cluster, err := cluster.New(log, _env, os.Getenv("CI") != "") + // if err != nil { + // return err + // } - err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) - if err != nil { - return err - } - } + // err = cluster.Create(ctx, vnetResourceGroup, clusterName, osClusterVersion) + // if err != nil { + // return err + // } + // } clusterResourceID = resourceIDFromEnv() @@ -436,7 +436,7 @@ func done(ctx context.Context) error { } var _ = BeforeSuite(func() { - log.Info("BeforeSuite e2e only") + log.Info("BeforeSuite chiac e2e test") SetDefaultEventuallyTimeout(DefaultEventuallyTimeout) SetDefaultEventuallyPollingInterval(10 * time.Second) @@ -450,7 +450,7 @@ var _ = BeforeSuite(func() { }) var _ = AfterSuite(func() { - log.Info("AfterSuite e2e only") + log.Info("AfterSuite chiac e2e test") // if err := done(context.Background()); err != nil { // if oDataError, ok := err.(msgraph_errors.ODataErrorable); ok { From 18c27946e744488c9f49d1afe60f499565f35131 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Thu, 30 Nov 2023 15:43:13 -0800 Subject: [PATCH 05/15] ip --- test/util/kubeadminkubeconfig/kubetoken.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index c3051864fa3..06a1d2473cc 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -48,7 +48,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "oauth-openshift", 1) + tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "20.232.133.211", 1) tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() From ef5567c8b628999ef522ca1e6c1d21dd439fab99 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Thu, 30 Nov 2023 16:24:00 -0800 Subject: [PATCH 06/15] tokenURL --- test/util/kubeadminkubeconfig/kubetoken.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index 06a1d2473cc..57872cc6850 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -9,7 +9,6 @@ import ( "fmt" "net/http" "net/url" - "strings" "time" ) @@ -48,7 +47,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "20.232.133.211", 1) + tokenURL.Host = "20.232.133.211" tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() @@ -65,6 +64,8 @@ func getAuthorizedToken(ctx context.Context, tokenURL *url.URL, username, passwo return "", err } + fmt.Println("tokenURL", tokenURL.String()) + req.SetBasicAuth(username, password) req.Header.Add("X-CSRF-Token", "1") From db34f8cb5b03e9d8ea16b3a34aaf305dfcd89a0e Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Thu, 30 Nov 2023 17:20:32 -0800 Subject: [PATCH 07/15] tokenURL --- test/util/kubeadminkubeconfig/kubetoken.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index 57872cc6850..4a31ed8d45c 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -47,7 +47,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = "20.232.133.211" + tokenURL.Host = "20.168.212.108" tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() From 4364069913cafe23feb4771f1d1f4efbcb2266be Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Fri, 15 Dec 2023 03:59:09 +0000 Subject: [PATCH 08/15] revert kubetoken --- test/util/kubeadminkubeconfig/kubetoken.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index 4a31ed8d45c..c0044f3fdc6 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -9,6 +9,7 @@ import ( "fmt" "net/http" "net/url" + "strings" "time" ) @@ -47,7 +48,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = "20.168.212.108" + tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "20.232.133.211", 1) tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() From 777068529af6843762da4e62a1eec1b8aca3334a Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Fri, 15 Dec 2023 04:01:10 +0000 Subject: [PATCH 09/15] revert kubetoken --- test/util/kubeadminkubeconfig/kubetoken.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index c0044f3fdc6..f715e08b57f 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -48,7 +48,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "20.232.133.211", 1) + tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "oauth-openshift", 1) tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() From c7d4fe1c9ae5b0298fad3f3c048c7f122ccef6ca Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Sat, 16 Dec 2023 01:05:29 +0000 Subject: [PATCH 10/15] public ip --- test/util/kubeadminkubeconfig/kubetoken.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index f715e08b57f..c514af5ca59 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -48,7 +48,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "oauth-openshift", 1) + tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "20.168.212.108", 1) tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() @@ -65,7 +65,7 @@ func getAuthorizedToken(ctx context.Context, tokenURL *url.URL, username, passwo return "", err } - fmt.Println("tokenURL", tokenURL.String()) + fmt.Println(tokenURL.String()) req.SetBasicAuth(username, password) req.Header.Add("X-CSRF-Token", "1") From 83e632cc679c12ea78692bca1a79b6499d263173 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Sat, 16 Dec 2023 01:37:06 +0000 Subject: [PATCH 11/15] tokenURL.Host --- test/util/kubeadminkubeconfig/kubetoken.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index c514af5ca59..8c3650bfbcf 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -9,7 +9,6 @@ import ( "fmt" "net/http" "net/url" - "strings" "time" ) @@ -48,7 +47,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "20.168.212.108", 1) + tokenURL.Host = "20.168.212.108" tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() From afa3f08df24f68adab6ae7ee8ad2cb78542f8574 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Sat, 16 Dec 2023 02:45:43 +0000 Subject: [PATCH 12/15] revert kubetoken --- test/util/kubeadminkubeconfig/kubetoken.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index 8c3650bfbcf..c696425acc3 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -47,7 +47,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = "20.168.212.108" + tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "oauth-openshift", 1) tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() From 0613cebadf7b10ba7fb3a34b58b4c69dc2e87a14 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Sat, 16 Dec 2023 02:46:01 +0000 Subject: [PATCH 13/15] revert kubetoken --- test/util/kubeadminkubeconfig/kubetoken.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index c696425acc3..9bcea00ee19 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -9,6 +9,7 @@ import ( "fmt" "net/http" "net/url" + "strings" "time" ) From 102243c40e9adb2c33fe68eeed9636a4f325a5f1 Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Sat, 16 Dec 2023 03:43:38 +0000 Subject: [PATCH 14/15] public ip --- test/util/kubeadminkubeconfig/kubetoken.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index 9bcea00ee19..8c3650bfbcf 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -9,7 +9,6 @@ import ( "fmt" "net/http" "net/url" - "strings" "time" ) @@ -48,7 +47,7 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "oauth-openshift", 1) + tokenURL.Host = "20.168.212.108" tokenURL.Path = "/oauth/authorize" q := tokenURL.Query() From 34eaae87659640054663c516aec663bb088ec7bb Mon Sep 17 00:00:00 2001 From: Jenny Chen Date: Mon, 18 Dec 2023 19:23:07 +0000 Subject: [PATCH 15/15] revert host --- test/util/kubeadminkubeconfig/kubetoken.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/util/kubeadminkubeconfig/kubetoken.go b/test/util/kubeadminkubeconfig/kubetoken.go index 8c3650bfbcf..d7db429e9c2 100644 --- a/test/util/kubeadminkubeconfig/kubetoken.go +++ b/test/util/kubeadminkubeconfig/kubetoken.go @@ -9,6 +9,7 @@ import ( "fmt" "net/http" "net/url" + "strings" "time" ) @@ -47,9 +48,12 @@ func getTokenURLFromConsoleURL(consoleURL string) (*url.URL, error) { return nil, err } - tokenURL.Host = "20.168.212.108" + tokenURL.Host = strings.Replace(tokenURL.Host, "console-openshift-console", "oauth-openshift", 1) + // tokenURL.Host = "20.168.212.108" tokenURL.Path = "/oauth/authorize" + fmt.Println(tokenURL.Host) + q := tokenURL.Query() q.Set("response_type", "token") q.Set("client_id", "openshift-challenging-client")