Changes due to review feedback.

Author: jweite-amazon

test/e2e/deploy_app_toxi.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Kubernetes Authors.
+Copyright 2022 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -40,15 +40,15 @@ func DeployAppToxiSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 		namespace                 *corev1.Namespace
 		cancelWatches             context.CancelFunc
 		clusterResources          *clusterctl.ApplyClusterTemplateAndWaitResult
+		toxicName                 string
+		toxiProxyContext          *helpers.ToxiProxyContext = nil
 		appName                                             = "httpd"
 		appManifestPath                                     = "data/fixture/sample-application.yaml"
 		expectedHtmlPath                                    = "data/fixture/expected-webpage.html"
 		appDeploymentReadyTimeout                           = 180
 		appPort                                             = 8080
 		appDefaultHtmlPath                                  = "/"
 		expectedHtml                                        = ""
-		toxiProxyContext          *helpers.ToxiProxyContext = nil
-		toxicName                 string
 	)
 
 	BeforeEach(func() {
@@ -64,8 +64,11 @@ func DeployAppToxiSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 		Expect(input.E2EConfig.Variables).To(HaveKey(KubernetesVersion))
 
 		// Setup a toxiProxy for this test.
-		toxiProxyContext = helpers.SetupForToxiproxyTesting(input.BootstrapClusterProxy)
-		toxicName = toxiProxyContext.AddLatencyToxic(100, 10, 100, false)
+		toxiProxyContext = helpers.SetupForToxiProxyTesting(input.BootstrapClusterProxy)
+		const TOXIC_LATENCY_MS = 100
+		const TOXIC_JITTER_MS = 100
+		const TOXIC_TOXICITY = 1
+		toxicName = toxiProxyContext.AddLatencyToxic(TOXIC_LATENCY_MS, TOXIC_JITTER_MS, TOXIC_TOXICITY, false)
 
 		// Setup a Namespace where to host objects for this spec and create a watcher for the namespace events.
 		namespace, cancelWatches = setupSpecNamespace(ctx, specName, toxiProxyContext.ClusterProxy, input.ArtifactFolder)

test/e2e/helpers/kubeconfig.go

@@ -130,7 +130,6 @@ func (k *Kubeconfig) GetCurrentClusterName() (string, error) {
 	}
 
 	return castClusterName, nil
-
 }
 
 func (k *Kubeconfig) GetCurrentCluster() (map[string]interface{}, error) {

test/e2e/helpers/toxiProxy.go

@@ -44,7 +44,7 @@ type ToxiProxyContext struct {
 	ToxiProxy      *toxiproxyapi.Proxy
 }
 
-func SetupForToxiproxyTesting(bootstrapClusterProxy framework.ClusterProxy) *ToxiProxyContext {
+func SetupForToxiProxyTesting(bootstrapClusterProxy framework.ClusterProxy) *ToxiProxyContext {
 	// Read/parse the actual kubeconfig for the cluster
 	kubeConfig := NewKubeconfig()
 	unproxiedKubeconfigPath := bootstrapClusterProxy.GetKubeconfigPath()
@@ -90,7 +90,12 @@ func SetupForToxiproxyTesting(bootstrapClusterProxy framework.ClusterProxy) *Tox
 	Expect(err).To(BeNil())
 
 	// Create a new ClusterProxy using the new kubeconfig
-	toxiproxyBootstrapClusterProxy := framework.NewClusterProxy("toxiproxy-bootstrap", toxiProxyKubeconfigPath, bootstrapClusterProxy.GetScheme(), framework.WithMachineLogCollector(framework.DockerLogCollector{}))
+	toxiproxyBootstrapClusterProxy := framework.NewClusterProxy(
+		"toxiproxy-bootstrap",
+		toxiProxyKubeconfigPath,
+		bootstrapClusterProxy.GetScheme(),
+		framework.WithMachineLogCollector(framework.DockerLogCollector{}),
+	)
 
 	return &ToxiProxyContext{
 		KubeconfigPath: toxiProxyKubeconfigPath,
@@ -107,7 +112,6 @@ func TearDownToxiProxy(toxiProxyContext *ToxiProxyContext) {
 	// Delete the kubeconfig pointing to the proxy
 	err = os.Remove(toxiProxyContext.KubeconfigPath)
 	Expect(err).To(BeNil())
-
 }
 
 func (tp *ToxiProxyContext) RemoveToxic(toxicName string) {