Skip to content

Commit 04db5ad

Browse files
committed
migrate off of deprecated KIND flags
1 parent 9d70aed commit 04db5ad

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

experiment/kind-conformance-image-e2e.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ install_kind() {
4848
# build kubernetes / node image, e2e binaries
4949
build() {
5050
# build the node image w/ kubernetes
51-
kind build node-image --kube-root="${PWD}"
51+
kind build node-image "${PWD}"
5252

5353
# ensure kubectl is in path
5454
local maybe_kubectl
@@ -94,7 +94,7 @@ EOF
9494
--image=kindest/node:latest \
9595
--retain \
9696
--wait=1m \
97-
--loglevel=debug \
97+
-v=3 \
9898
"--config=${ARTIFACTS}/kind-config.yaml"
9999
}
100100

kubetest/kind/kind.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ func (d *Deployer) Build() error {
235235
buildNodeImage = kindNodeImageLatest
236236
}
237237

238-
args := []string{"build", "node-image", "--type=" + buildType, flagLogLevel, "--kube-root=" + d.importPathK8s}
238+
args := []string{"build", "node-image", "--type=" + buildType, flagLogLevel}
239239
if buildNodeImage != "" {
240240
args = append(args, "--image="+buildNodeImage)
241241
// override user-specified node image
@@ -246,6 +246,7 @@ func (d *Deployer) Build() error {
246246
}
247247

248248
// Build the node image (including kubernetes)
249+
args = append(args, d.importPathK8s)
249250
cmd := exec.Command("kind", args...)
250251
if err := d.control.FinishRunning(cmd); err != nil {
251252
return err

0 commit comments

Comments
 (0)