Merge pull request #8839 from staticdev/nginx-slow-version

Bump nginx-ingress-controller

Author: tstromberg

deploy/addons/ingress/ingress-dp.yaml.tmpl

@@ -48,7 +48,7 @@ spec:
       serviceAccountName: ingress-nginx
       containers:
         - name: controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.33.0
+          image: us.gcr.io/k8s-artifacts-prod/ingress-nginx/controller:v0.34.1@sha256:0e072dddd1f7f8fc8909a2ca6f65e76c5f0d2fcfb8be47935ae3457e8bbceb20
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:

pkg/minikube/perf/start.go

@@ -58,6 +58,11 @@ func collectResults(ctx context.Context, binaries []*Binary, driver string) (*re
 				return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name())
 			}
 			rm.addResult(binary, r)
+			r, err = timeEnableIngress(ctx, binary)
+			if err != nil {
+				return nil, errors.Wrapf(err, "timing run %d with %s", run, binary.Name())
+			}
+			rm.addResult(binary, r)
 		}
 	}
 	return rm, nil
@@ -72,22 +77,35 @@ func average(nums []float64) float64 {
 }
 
 // timeMinikubeStart returns the time it takes to execute `minikube start`
-// It deletes the VM after `minikube start`.
 func timeMinikubeStart(ctx context.Context, binary *Binary, driver string) (*result, error) {
 	startCmd := exec.CommandContext(ctx, binary.path, "start", fmt.Sprintf("--driver=%s", driver))
 	startCmd.Stderr = os.Stderr
 
+	log.Printf("Running: %v...", startCmd.Args)
+	r, err := timeCommandLogs(startCmd)
+	if err != nil {
+		return nil, errors.Wrapf(err, "timing cmd: %v", startCmd.Args)
+	}
+	return r, nil
+}
+
+// timeEnableIngress returns the time it takes to execute `minikube addons enable ingress`
+// It deletes the VM after `minikube addons enable ingress`.
+func timeEnableIngress(ctx context.Context, binary *Binary) (*result, error) {
+	enableCmd := exec.CommandContext(ctx, binary.path, "addons enable ingress")
+	enableCmd.Stderr = os.Stderr
+
 	deleteCmd := exec.CommandContext(ctx, binary.path, "delete")
 	defer func() {
 		if err := deleteCmd.Run(); err != nil {
 			log.Printf("error deleting minikube: %v", err)
 		}
 	}()
 
-	log.Printf("Running: %v...", startCmd.Args)
-	r, err := timeCommandLogs(startCmd)
+	log.Printf("Running: %v...", enableCmd.Args)
+	r, err := timeCommandLogs(enableCmd)
 	if err != nil {
-		return nil, errors.Wrapf(err, "timing cmd: %v", startCmd.Args)
+		return nil, errors.Wrapf(err, "timing cmd: %v", enableCmd.Args)
 	}
 	return r, nil
 }