Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

migrate off of deprecated KIND flags #33331

Merged
merged 1 commit into from
Aug 17, 2024
Merged

migrate off of deprecated KIND flags #33331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions experiment/kind-conformance-image-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -94,7 +94,7 @@ EOF
--image=kindest/node:latest \
--retain \
--wait=1m \
--loglevel=debug \
-v=3 \
"--config=${ARTIFACTS}/kind-config.yaml"
}

Expand Down
3 changes: 2 additions & 1 deletion kubetest/kind/kind.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down