Merge pull request #33331 from BenTheElder/set-loglevel-v

migrate off of deprecated KIND flags
kubernetes · Aug 17, 2024 · 9d8af80 · 9d8af80
2 parents f659c26 + 04db5ad
commit 9d8af80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/experiment/kind-conformance-image-e2e.sh b/experiment/kind-conformance-image-e2e.sh
@@ -48,7 +48,7 @@ install_kind() {
 # build kubernetes / node image, e2e binaries
 build() {
     # build the node image w/ kubernetes
-    kind build node-image --kube-root="${PWD}"
+    kind build node-image "${PWD}"
 
     # ensure kubectl is in path
     local maybe_kubectl
@@ -94,7 +94,7 @@ EOF
         --image=kindest/node:latest \
         --retain \
         --wait=1m \
-        --loglevel=debug \
+        -v=3 \
         "--config=${ARTIFACTS}/kind-config.yaml"
 }
 

diff --git a/kubetest/kind/kind.go b/kubetest/kind/kind.go
@@ -235,7 +235,7 @@ func (d *Deployer) Build() error {
 		buildNodeImage = kindNodeImageLatest
 	}
 
-	args := []string{"build", "node-image", "--type=" + buildType, flagLogLevel, "--kube-root=" + d.importPathK8s}
+	args := []string{"build", "node-image", "--type=" + buildType, flagLogLevel}
 	if buildNodeImage != "" {
 		args = append(args, "--image="+buildNodeImage)
 		// override user-specified node image
@@ -246,6 +246,7 @@ func (d *Deployer) Build() error {
 	}
 
 	// Build the node image (including kubernetes)
+	args = append(args, d.importPathK8s)
 	cmd := exec.Command("kind", args...)
 	if err := d.control.FinishRunning(cmd); err != nil {
 		return err