From 7257762c45a8040102075adafeb28797a62f05e0 Mon Sep 17 00:00:00 2001 From: Brad Stein Date: Tue, 9 Sep 2025 00:22:24 -0500 Subject: [PATCH] zot simplification --- services/zot/ingress.yaml | 4 +-- services/zot/kustomization.yaml | 4 +-- services/zot/middleware.yaml | 48 ++++++++++++++++----------------- services/zot/tlsoptions.yaml | 18 ++++++------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/services/zot/ingress.yaml b/services/zot/ingress.yaml index aa79e95..5bb8354 100644 --- a/services/zot/ingress.yaml +++ b/services/zot/ingress.yaml @@ -8,8 +8,8 @@ metadata: cert-manager.io/cluster-issuer: letsencrypt-prod traefik.ingress.kubernetes.io/router.entrypoints: websecure traefik.ingress.kubernetes.io/router.tls: "true" - traefik.ingress.kubernetes.io/router.tls.options: zot-h1only@kubernetescrd - traefik.ingress.kubernetes.io/router.middlewares: zot-zot-headers@kubernetescrd,zot-zot-buffering@kubernetescrd + # traefik.ingress.kubernetes.io/router.tls.options: zot-h1only@kubernetescrd + # traefik.ingress.kubernetes.io/router.middlewares: zot-zot-headers@kubernetescrd,zot-zot-buffering@kubernetescrd spec: ingressClassName: traefik tls: diff --git a/services/zot/kustomization.yaml b/services/zot/kustomization.yaml index 48acd1f..72ed4b7 100644 --- a/services/zot/kustomization.yaml +++ b/services/zot/kustomization.yaml @@ -8,6 +8,6 @@ resources: - configmap.yaml - service.yaml - ingress.yaml - - middleware.yaml - - tlsoptions.yaml + # - middleware.yaml + # - tlsoptions.yaml \ No newline at end of file diff --git a/services/zot/middleware.yaml b/services/zot/middleware.yaml index 3df1cec..003d25c 100644 --- a/services/zot/middleware.yaml +++ b/services/zot/middleware.yaml @@ -1,26 +1,26 @@ -# services/zot/middleware.yaml -apiVersion: traefik.io/v1alpha1 -kind: Middleware -metadata: - name: zot-headers - namespace: zot -spec: - headers: - customRequestHeaders: - Docker-Distribution-Api-Version: "registry/2.0" +# # services/zot/middleware.yaml +# apiVersion: traefik.io/v1alpha1 +# kind: Middleware +# metadata: +# name: zot-headers +# namespace: zot +# spec: +# headers: +# customRequestHeaders: +# Docker-Distribution-Api-Version: "registry/2.0" ---- +# --- -apiVersion: traefik.io/v1alpha1 -kind: Middleware -metadata: - name: zot-buffering - namespace: zot -spec: - buffering: - # "0" here means "no limit" for Traefik's buffering middleware - maxRequestBodyBytes: 0 - memRequestBodyBytes: 0 - maxResponseBodyBytes: 0 - memResponseBodyBytes: 0 - retryExpression: "IsNetworkError() && Attempts() <= 2" +# apiVersion: traefik.io/v1alpha1 +# kind: Middleware +# metadata: +# name: zot-buffering +# namespace: zot +# spec: +# buffering: +# # "0" here means "no limit" for Traefik's buffering middleware +# maxRequestBodyBytes: 0 +# memRequestBodyBytes: 0 +# maxResponseBodyBytes: 0 +# memResponseBodyBytes: 0 +# retryExpression: "IsNetworkError() && Attempts() <= 2" diff --git a/services/zot/tlsoptions.yaml b/services/zot/tlsoptions.yaml index 8d7936b..7a13d8a 100644 --- a/services/zot/tlsoptions.yaml +++ b/services/zot/tlsoptions.yaml @@ -1,9 +1,9 @@ -# services/zot/tlsoptions.yaml -apiVersion: traefik.io/v1alpha1 -kind: TLSOption -metadata: - name: h1only - namespace: zot -spec: - alpnProtocols: - - http/1.1 \ No newline at end of file +# # services/zot/tlsoptions.yaml +# apiVersion: traefik.io/v1alpha1 +# kind: TLSOption +# metadata: +# name: h1only +# namespace: zot +# spec: +# alpnProtocols: +# - http/1.1 \ No newline at end of file