Skip to content

Commit

Permalink
Add kind e2e test for ko run (#779)
Browse files Browse the repository at this point in the history
  • Loading branch information
imjasonh authored Jul 22, 2022
1 parent 2f230b8 commit ccddbb8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/kind-e2e.yaml
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
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

0 comments on commit ccddbb8

Please sign in to comment.