From 5e3d9ddfff97881f15fc04a05f931fdf1a18fed9 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 25 Jan 2023 15:46:14 -0500 Subject: [PATCH] Add comments explicitly on what we need to do later Signed-off-by: Davanum Srinivas --- tests/integration/go.mod | 1 - tests/integration/go.sum | 10 +--------- tests/integration/server/main_test.go | 4 ++++ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/integration/go.mod b/tests/integration/go.mod index 77a96ad4a..764bdb278 100644 --- a/tests/integration/go.mod +++ b/tests/integration/go.mod @@ -9,7 +9,6 @@ require ( k8s.io/api v0.26.1 k8s.io/apimachinery v0.26.1 k8s.io/client-go v0.26.1 - k8s.io/klog/v2 v2.80.1 k8s.io/kubernetes v1.26.1 sigs.k8s.io/aws-iam-authenticator v0.0.0-00010101000000-000000000000 ) diff --git a/tests/integration/go.sum b/tests/integration/go.sum index f4207d41f..2f4edb29f 100644 --- a/tests/integration/go.sum +++ b/tests/integration/go.sum @@ -104,19 +104,11 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= -<<<<<<< HEAD -github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.44.116/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.213 h1:WahquyWs7cQdz0vpDVWyWETEemgSoORx0PbWL9oz2WA= github.com/aws/aws-sdk-go v1.44.213/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= -======= -github.com/aws/aws-sdk-go v1.44.116/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.145 h1:KMVRrIyjBsNz3xGPuHIRnhIuKlb5h3Ii5e5jbi3cgnc= -github.com/aws/aws-sdk-go v1.44.145/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= ->>>>>>> 1dbfb1c0 (Bump dependencies and go version (in go.mod)) github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/tests/integration/server/main_test.go b/tests/integration/server/main_test.go index 679d49929..a6bc9d30d 100644 --- a/tests/integration/server/main_test.go +++ b/tests/integration/server/main_test.go @@ -38,6 +38,10 @@ func TestMain(m *testing.M) { flag.StringVar(&roleARN, "role-arn", "", "ARN of role to be authenticated in the test. This role ARN is added to the configmap and it should be assumable by the test run.") flag.StringVar(&testArtifactsDir, "test-artifacts-dir", "", "Directory used for artifacts generated from test runs.") + // TODO(dims): earlier we had `framework.EtcdMain` here. EtcdMain has code to check for number of goroutines leaked + // which trips us up. So using the hack to call `startEtcd` instead which is in the same module. The alternative was + // to use `RunCustomEtcd`, but that has a bug which is being fixed in upstream https://github.com/kubernetes/kubernetes/pull/115254 + // once that gets available in a new release in kubernetes, we should switch to it. flag.Parse() stop, err := startEtcd() if err != nil {