From 59399062bfdafab8277024d2fdd7f88e96106aac Mon Sep 17 00:00:00 2001 From: Morlay Date: Tue, 15 Oct 2024 17:25:42 +0800 Subject: [PATCH] chore(deps): updates --- Makefile | 2 +- go.mod | 4 ++-- go.sum | 4 ++-- pkg/content/proxy/manifest_service.go | 1 - pkg/registryhttp/apis/registry/base_url.go | 1 - pkg/registryhttp/apis/registry/base_url_test.go | 11 +++++++++++ pkg/registryhttp/apis/registry/manifest__get.go | 1 - 7 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 pkg/registryhttp/apis/registry/base_url_test.go diff --git a/Makefile b/Makefile index 03c9fbe..c317def 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ debug.pull: crane pull --format=oci --insecure 0.0.0.0:5050/docker.io/library/nginx:latest .tmp/nginx.tar debug.pull.proxy: - crane pull --format=oci --insecure 0.0.0.0:5050/${CONTAINER_REGISTRY}/ghcr.io/octohelm/crkit:v0.0.0-20240926121153-ee21b4f4c7cd .tmp/crkit.tar + crane pull --format=oci --insecure 0.0.0.0:5050/${CONTAINER_REGISTRY}/ghcr.io/octohelm/crkit:v0.0.0-20241015075301-491947339730 .tmp/crkit.tar debug.push: crane push --insecure .tmp/nginx.tar 0.0.0.0:5050/docker.io/library/nginx:latest diff --git a/go.mod b/go.mod index dbc012b..20a055f 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.23.2 require ( github.com/containerd/containerd v1.7.23 github.com/containerd/platforms v0.2.1 + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/distribution/reference v0.6.0 github.com/go-courier/logr v0.3.0 github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1 @@ -12,7 +13,7 @@ require ( github.com/google/go-containerregistry v0.20.2 github.com/google/uuid v1.6.0 github.com/innoai-tech/infra v0.0.0-20241008041626-af0207c05b5b - github.com/octohelm/courier v0.0.0-20241015075216-73c8ee334551 + github.com/octohelm/courier v0.0.0-20241015092437-54a7caa12da6 github.com/octohelm/gengo v0.0.0-20241014043309-2344b8632080 github.com/octohelm/kubekit v0.0.0-20240816091736-f2433647d633 github.com/octohelm/kubepkgspec v0.0.0-20241015012541-484a91b9d42a @@ -39,7 +40,6 @@ require ( github.com/containerd/errdefs v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/cli v27.1.1+incompatible // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect diff --git a/go.sum b/go.sum index 56e362e..30048a1 100644 --- a/go.sum +++ b/go.sum @@ -178,8 +178,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/octohelm/courier v0.0.0-20241015075216-73c8ee334551 h1:HpeD19dzNrHl8fzBCWiaxxTF9P7en8oDR9gz/e/cjDo= -github.com/octohelm/courier v0.0.0-20241015075216-73c8ee334551/go.mod h1:uHccmYdw4rrly3faZQHLkZGCDYjj3zuwjKrUYo4QiXo= +github.com/octohelm/courier v0.0.0-20241015092437-54a7caa12da6 h1:TpKMsPNw6Eea6ROu4SPA3bEqUsQUZa77phq2gJ84Voc= +github.com/octohelm/courier v0.0.0-20241015092437-54a7caa12da6/go.mod h1:uHccmYdw4rrly3faZQHLkZGCDYjj3zuwjKrUYo4QiXo= github.com/octohelm/gengo v0.0.0-20241014043309-2344b8632080 h1:JydhpFfiuBsIXWs4f3GQJDpCmG5LFKgzB7CFkRGWs3s= github.com/octohelm/gengo v0.0.0-20241014043309-2344b8632080/go.mod h1:7bkbdNmnQEmnVbvdSJdRwvGmm2/3KgvxXSDi/nXCOk8= github.com/octohelm/kubekit v0.0.0-20240816091736-f2433647d633 h1:pLd+NUgPr6suaX8I/rhoRf8iFFoGeRFjiqYAF3mXgYE= diff --git a/pkg/content/proxy/manifest_service.go b/pkg/content/proxy/manifest_service.go index 837b375..7b73cec 100644 --- a/pkg/content/proxy/manifest_service.go +++ b/pkg/content/proxy/manifest_service.go @@ -3,7 +3,6 @@ package proxy import ( "context" "fmt" - "github.com/distribution/reference" "github.com/go-courier/logr" manifestv1 "github.com/octohelm/crkit/pkg/apis/manifest/v1" diff --git a/pkg/registryhttp/apis/registry/base_url.go b/pkg/registryhttp/apis/registry/base_url.go index 916f6df..f168e22 100644 --- a/pkg/registryhttp/apis/registry/base_url.go +++ b/pkg/registryhttp/apis/registry/base_url.go @@ -2,7 +2,6 @@ package registry import ( "context" - "github.com/octohelm/crkit/pkg/content" "github.com/octohelm/courier/pkg/courierhttp" diff --git a/pkg/registryhttp/apis/registry/base_url_test.go b/pkg/registryhttp/apis/registry/base_url_test.go new file mode 100644 index 0000000..1d82f52 --- /dev/null +++ b/pkg/registryhttp/apis/registry/base_url_test.go @@ -0,0 +1,11 @@ +package registry + +import ( + "github.com/davecgh/go-spew/spew" + "net/url" + "testing" +) + +func TestNamescoped(t *testing.T) { + spew.Dump(url.PathUnescape("harbor.innoai.tech%2Fghcr.io%2Foctohelm%2Fcrkit")) +} diff --git a/pkg/registryhttp/apis/registry/manifest__get.go b/pkg/registryhttp/apis/registry/manifest__get.go index 38880d2..52e0fe2 100644 --- a/pkg/registryhttp/apis/registry/manifest__get.go +++ b/pkg/registryhttp/apis/registry/manifest__get.go @@ -2,7 +2,6 @@ package registry import ( "context" - "github.com/octohelm/courier/pkg/courierhttp" manifestv1 "github.com/octohelm/crkit/pkg/apis/manifest/v1" "github.com/octohelm/crkit/pkg/content"