Skip to content

Commit

Permalink
fix: proxy mode
Browse files Browse the repository at this point in the history
  • Loading branch information
morlay committed Oct 15, 2024
1 parent ee21b4f commit 4919473
Show file tree
Hide file tree
Showing 70 changed files with 2,334 additions and 1,040 deletions.
16 changes: 15 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,23 @@ serve:
--log-format=text \
--addr=:5050

serve.proxy:
$(CRKIT) serve registry -c \
--log-format=text \
--remote-endpoint=https://${CONTAINER_REGISTRY} \
--remote-username=${CONTAINER_REGISTRY_USERNAME} \
--remote-password=${CONTAINER_REGISTRY_PASSWORD} \
--addr=:5050

dump.k8s:
$(CRKIT) serve registry --dump-k8s

gen:
go run ./internal/cmd/tool gen ./internal/cmd/crkit

gen.debug:
go run ./internal/cmd/tool gen ./pkg/content/api

dep:
go get -u ./...

Expand All @@ -33,7 +44,10 @@ ship:
$(PIPER) do ship

debug.pull:
crane pull --insecure 0.0.0.0:5050/docker.io/library/nginx:latest .tmp/nginx.tar
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

debug.push:
crane push --insecure .tmp/nginx.tar 0.0.0.0:5050/docker.io/library/nginx:latest
Expand Down
67 changes: 33 additions & 34 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
module github.com/octohelm/crkit

go 1.23.1
go 1.23.2

require (
github.com/containerd/containerd v1.7.22
github.com/containerd/containerd v1.7.23
github.com/containerd/platforms v0.2.1
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
github.com/gobwas/glob v0.2.3
github.com/google/go-containerregistry v0.20.2
github.com/google/uuid v1.6.0
github.com/innoai-tech/infra v0.0.0-20240920044133-bd9089f58588
github.com/octohelm/courier v0.0.0-20240926074601-b33108060546
github.com/octohelm/gengo v0.0.0-20240919101245-4bc8a41dd2f4
github.com/innoai-tech/infra v0.0.0-20241008041626-af0207c05b5b
github.com/octohelm/courier v0.0.0-20241015075216-73c8ee334551
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-20240910052731-07f208736894
github.com/octohelm/storage v0.0.0-20240923082032-9c037f4e0c05
github.com/octohelm/kubepkgspec v0.0.0-20241015012541-484a91b9d42a
github.com/octohelm/storage v0.0.0-20241014040055-4f454a8d6947
github.com/octohelm/unifs v0.0.0-20240906103445-29045af3bc39
github.com/octohelm/x v0.0.0-20240904081416-42a1ee2d28a9
github.com/octohelm/x v0.0.0-20241011014327-0fcf864c84d6
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0
github.com/pelletier/go-toml/v2 v2.2.3
github.com/pkg/errors v0.9.1
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
golang.org/x/sync v0.8.0
k8s.io/api v0.31.1
k8s.io/apimachinery v0.31.1
Expand All @@ -35,13 +36,13 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
github.com/containerd/errdefs v0.2.0 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // 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.3.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // 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
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
Expand All @@ -50,7 +51,6 @@ require (
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-json-experiment/json v0.0.0-20240815175050-ebd3a8989ca1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand All @@ -68,35 +68,35 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/innoai-tech/openapi-playground v0.0.0-20240920071141-a9f087bad00f // indirect
github.com/innoai-tech/openapi-playground v0.0.0-20240909062817-20f99d67805e // indirect
github.com/jlaffaye/ftp v0.2.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/ansiterm v1.0.0 // indirect
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/klauspost/compress v1.17.10 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/lunixbochs/vtclean v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/minio-go/v7 v7.0.77 // indirect
github.com/minio/minio-go/v7 v7.0.75 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/gomega v1.34.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.20.4 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/rs/xid v1.6.0 // indirect
github.com/rs/xid v1.5.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect
github.com/vbatts/tar-split v0.11.3 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.30.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
Expand All @@ -111,29 +111,28 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/tools v0.25.0 // indirect
golang.org/x/tools v0.26.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect
google.golang.org/grpc v1.67.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.66.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/client-go v0.31.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f // indirect
k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect
sigs.k8s.io/gateway-api v1.1.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
Loading

0 comments on commit 4919473

Please sign in to comment.