Skip to content

Commit

Permalink
Tidy up go dependencies (#885)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrhouston authored Jun 16, 2022
1 parent 326ed12 commit 8c6a015
Show file tree
Hide file tree
Showing 48 changed files with 850 additions and 321 deletions.
6 changes: 0 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,3 @@ require (
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
)

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.5.10 // https://github.com/advisories/GHSA-crp2-qrr5-8pq7
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 // https://github.com/advisories/GHSA-77vh-xpmg-72qh
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3 // https://github.com/advisories/GHSA-v95c-p5hm-xq8f
)
287 changes: 281 additions & 6 deletions go.sum

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion helm/resource_release_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package helm
import (
"fmt"
"math/rand"
"net"
"os"
"os/exec"
"path"
Expand Down Expand Up @@ -1220,13 +1221,25 @@ func TestAccResourceRelease_manifest(t *testing.T) {
})
}

func randPort() int {
for {
p := rand.Intn(65535-1024) + 1024
hp := fmt.Sprintf("0.0.0.0:%d", p)
c, err := net.DialTimeout("tcp", hp, time.Second)
if err != nil {
return p
}
c.Close()
}
}

func setupOCIRegistry(t *testing.T, usepassword bool) (string, func()) {
dockerPath, err := exec.LookPath("docker")
if err != nil {
t.Skip("Starting the OCI registry requires docker to be installed in the PATH")
}

ociRegistryPort := rand.Intn(65535-1024) + 1024
ociRegistryPort := randPort()
ociRegistryURL := fmt.Sprintf("oci://localhost:%d/helm-charts", ociRegistryPort)
regitryContainerName := randName("registry")

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 19 additions & 16 deletions vendor/github.com/containerd/containerd/content/helpers.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8c6a015

Please sign in to comment.