1berry/spegel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #507 from spegel-org/resolve-timeout

Browse Source 
Change default resolve timeout to 20ms
This commit is contained in:
Philip Laine 2024-06-09 14:14:48 +02:00 committed by GitHub
commit 9725ab5dcf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/spegel/README.md
View File

@ -97,7 +97,7 @@ spec:
| spegel.kubeconfigPath | string | `""` | Path to Kubeconfig credentials, should only be set if Spegel is run in an environment without RBAC. | | spegel.kubeconfigPath | string | `""` | Path to Kubeconfig credentials, should only be set if Spegel is run in an environment without RBAC. |
| spegel.logLevel | string | `"INFO"` | Minimum log level to output. Value should be DEBUG, INFO, WARN, or ERROR. | | spegel.logLevel | string | `"INFO"` | Minimum log level to output. Value should be DEBUG, INFO, WARN, or ERROR. |
| spegel.mirrorResolveRetries | int | `3` | Max ammount of mirrors to attempt. | | spegel.mirrorResolveRetries | int | `3` | Max ammount of mirrors to attempt. |
| spegel.mirrorResolveTimeout | string | `"5s"` | Max duration spent finding a mirror. | | spegel.mirrorResolveTimeout | string | `"20ms"` | Max duration spent finding a mirror. |
| spegel.registries | list | `["https://cgr.dev","https://docker.io","https://ghcr.io","https://quay.io","https://mcr.microsoft.com","https://public.ecr.aws","https://gcr.io","https://registry.k8s.io","https://k8s.gcr.io","https://lscr.io"]` | Registries for which mirror configuration will be created. | | spegel.registries | list | `["https://cgr.dev","https://docker.io","https://ghcr.io","https://quay.io","https://mcr.microsoft.com","https://public.ecr.aws","https://gcr.io","https://registry.k8s.io","https://k8s.gcr.io","https://lscr.io"]` | Registries for which mirror configuration will be created. |
| spegel.resolveLatestTag | bool | `true` | When true latest tags will be resolved to digests. | | spegel.resolveLatestTag | bool | `true` | When true latest tags will be resolved to digests. |
| spegel.resolveTags | bool | `true` | When true Spegel will resolve tags to digests. | | spegel.resolveTags | bool | `true` | When true Spegel will resolve tags to digests. |

2
charts/spegel/values.yaml
View File

@ -139,7 +139,7 @@ spegel:
# -- Max ammount of mirrors to attempt. # -- Max ammount of mirrors to attempt.
mirrorResolveRetries: 3 mirrorResolveRetries: 3
# -- Max duration spent finding a mirror. # -- Max duration spent finding a mirror.
mirrorResolveTimeout: "5s" mirrorResolveTimeout: "20ms"
# -- Path to Containerd socket. # -- Path to Containerd socket.
containerdSock: "/run/containerd/containerd.sock" containerdSock: "/run/containerd/containerd.sock"
# -- Containerd namespace where images are stored. # -- Containerd namespace where images are stored.

2
main.go
View File

@ -60,7 +60,7 @@ type RegistryCmd struct {
RouterAddr string `arg:"--router-addr,env:ROUTER_ADDR,required" help:"address to serve router."` RouterAddr string `arg:"--router-addr,env:ROUTER_ADDR,required" help:"address to serve router."`
RegistryAddr string `arg:"--registry-addr,env:REGISTRY_ADDR,required" help:"address to server image registry."` RegistryAddr string `arg:"--registry-addr,env:REGISTRY_ADDR,required" help:"address to server image registry."`
Registries []url.URL `arg:"--registries,env:REGISTRIES,required" help:"registries that are configured to be mirrored."` Registries []url.URL `arg:"--registries,env:REGISTRIES,required" help:"registries that are configured to be mirrored."`
MirrorResolveTimeout time.Duration `arg:"--mirror-resolve-timeout,env:MIRROR_RESOLVE_TIMEOUT" default:"5s" help:"Max duration spent finding a mirror."` MirrorResolveTimeout time.Duration `arg:"--mirror-resolve-timeout,env:MIRROR_RESOLVE_TIMEOUT" default:"20ms" help:"Max duration spent finding a mirror."`
MirrorResolveRetries int `arg:"--mirror-resolve-retries,env:MIRROR_RESOLVE_RETRIES" default:"3" help:"Max amount of mirrors to attempt."` MirrorResolveRetries int `arg:"--mirror-resolve-retries,env:MIRROR_RESOLVE_RETRIES" default:"3" help:"Max amount of mirrors to attempt."`
ResolveLatestTag bool `arg:"--resolve-latest-tag,env:RESOLVE_LATEST_TAG" default:"true" help:"When true latest tags will be resolved to digests."` ResolveLatestTag bool `arg:"--resolve-latest-tag,env:RESOLVE_LATEST_TAG" default:"true" help:"When true latest tags will be resolved to digests."`
} }

2
pkg/registry/registry.go
View File

@ -88,7 +88,7 @@ func NewRegistry(ociClient oci.Client, router routing.Router, opts ...Option) *R
ociClient: ociClient, ociClient: ociClient,
router: router, router: router,
resolveRetries: 3, resolveRetries: 3,
resolveTimeout: 1 * time.Second, resolveTimeout: 20 * time.Millisecond,
resolveLatestTag: true, resolveLatestTag: true,
} }
for _, opt := range opts { for _, opt := range opts {