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

Add kind e2e test for ko run #779

Merged
merged 1 commit into from
Jul 22, 2022
Merged

Add kind e2e test for ko run #779

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
3 changes: 3 additions & 0 deletions .github/workflows/kind-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ jobs:
kubectl wait --timeout=60s --for=condition=Ready pod/kodata
kubectl delete pod kodata

# Test ko run with kind load
# This tests that --labels are passed to kubectl, and -wait is passed to the test binary.
KO_DOCKER_REPO=kind.local ko run ./test -- --labels=foo=bar -- -wait=false

- name: Check SBOM
run: |
Expand Down
11 changes: 9 additions & 2 deletions pkg/publish/kind/write.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package kind

import (
"bytes"
"context"
"fmt"
"io"
Expand Down Expand Up @@ -46,9 +47,12 @@ var GetProvider = func() provider {
// Tag adds a tag to an already existent image.
func Tag(ctx context.Context, src, dest name.Tag) error {
return onEachNode(func(n nodes.Node) error {
var buf bytes.Buffer
cmd := n.CommandContext(ctx, "ctr", "--namespace=k8s.io", "images", "tag", "--force", src.String(), dest.String())
cmd.SetStdout(&buf)
cmd.SetStderr(&buf)
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to tag image: %w", err)
return fmt.Errorf("failed to tag image: %w\n%s", err, buf.String())
}
return nil
})
Expand All @@ -64,9 +68,12 @@ func Write(ctx context.Context, tag name.Tag, img v1.Image) error {
return pw.CloseWithError(tarball.Write(tag, img, pw))
})

var buf bytes.Buffer
cmd := n.CommandContext(ctx, "ctr", "--namespace=k8s.io", "images", "import", "-").SetStdin(pr)
cmd.SetStdout(&buf)
cmd.SetStderr(&buf)
if err := cmd.Run(); err != nil {
return fmt.Errorf("failed to load image to node %q: %w", n, err)
return fmt.Errorf("failed to load image to node %q: %w\n%s", n, err, buf.String())
}

if err := grp.Wait(); err != nil {
Expand Down