diff --git a/kubernetes/main/talos/talconfig.yaml b/kubernetes/main/talos/talconfig.yaml index 22e9c5a87ad..8e804a2f5f2 100644 --- a/kubernetes/main/talos/talconfig.yaml +++ b/kubernetes/main/talos/talconfig.yaml @@ -137,36 +137,6 @@ controlPlane: aliases: - ${clusterName}.${clusterDNSSuffix} - # Configure pull through cache - - |- - machine: - registries: - mirrors: - docker.io: - endpoints: - - https://zot.bjw-s.dev/v2/docker.io - overridePath: true - ghcr.io: - endpoints: - - https://zot.bjw-s.dev/v2/ghcr.io - overridePath: true - quay.io: - endpoints: - - https://zot.bjw-s.dev/v2/quay.io - overridePath: true - gcr.io: - endpoints: - - https://zot.bjw-s.dev/v2/gcr.io - overridePath: true - registry.k8s.io: - endpoints: - - https://zot.bjw-s.dev/v2/registry.k8s.io - overridePath: true - public.ecr.aws: - endpoints: - - https://zot.bjw-s.dev/v2/public.ecr.aws - overridePath: true - # Cluster configuration - |- cluster: diff --git a/kubernetes/nas/apps/storage/kustomization.yaml b/kubernetes/nas/apps/storage/kustomization.yaml index 9c2c40e15a0..434b81132de 100644 --- a/kubernetes/nas/apps/storage/kustomization.yaml +++ b/kubernetes/nas/apps/storage/kustomization.yaml @@ -7,4 +7,3 @@ resources: # Flux-Kustomizations - ./kopia/ks.yaml - ./minio/ks.yaml - - ./zot/ks.yaml diff --git a/kubernetes/nas/apps/storage/zot/app/config/config.json b/kubernetes/nas/apps/storage/zot/app/config/config.json deleted file mode 100644 index 8bdaf0962dc..00000000000 --- a/kubernetes/nas/apps/storage/zot/app/config/config.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "distSpecVersion": "1.0.1", - "storage": { - "rootDirectory": "/var/lib/registry", - "dedupe": true, - "gc": true, - "gcDelay": "1h", - "gcInterval": "24h", - "retention": { - "dryRun": false, - "delay": "24h", - "policies": [ - { - "repositories": ["**"], - "deleteReferrers": true, - "deleteUntagged": true, - "keepTags": [ - { - "mostRecentlyPushedCount": 5, - "mostRecentlyPulledCount": 5, - "pulledWithin": "720h", - "pushedWithin": "720h" - } - ] - } - ] - } - }, - "http": { - "address": "0.0.0.0", - "port": "5000" - }, - "log": { - "level": "info" - }, - "extensions": { - "ui": { - "enable": true - }, - "search": { - "enable": true - }, - "scrub": { - "enable": false, - "interval": "24h" - }, - "sync": { - "enable": true, - "registries": [ - { - "urls": ["https://index.docker.io"], - "content": [ - { - "prefix": "**", - "destination": "/docker.io" - } - ], - "onDemand": true, - "tlsVerify": true - }, - { - "urls": ["https://gcr.io"], - "content": [ - { - "prefix": "**", - "destination": "/gcr.io" - } - ], - "onDemand": true, - "tlsVerify": true - }, - { - "urls": ["https://ghcr.io"], - "content": [ - { - "prefix": "**", - "destination": "/ghcr.io" - } - ], - "onDemand": true, - "tlsVerify": true - }, - { - "urls": ["https://quay.io"], - "content": [ - { - "prefix": "**", - "destination": "/quay.io" - } - ], - "onDemand": true, - "tlsVerify": true - }, - { - "urls": ["https://registry.k8s.io"], - "content": [ - { - "prefix": "**", - "destination": "/registry.k8s.io" - } - ], - "onDemand": true, - "tlsVerify": true - }, - { - "urls": ["https://public.ecr.aws"], - "content": [ - { - "prefix": "**", - "destination": "/public.ecr.aws" - } - ], - "onDemand": true, - "tlsVerify": true - } - ] - } - } -} diff --git a/kubernetes/nas/apps/storage/zot/app/externalsecret.yaml b/kubernetes/nas/apps/storage/zot/app/externalsecret.yaml deleted file mode 100644 index b3345026bf2..00000000000 --- a/kubernetes/nas/apps/storage/zot/app/externalsecret.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/external-secrets.io/externalsecret_v1beta1.json -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: zot -spec: - secretStoreRef: - kind: ClusterSecretStore - name: onepassword-connect - target: - name: zot-secret - creationPolicy: Owner - template: - templateFrom: - - configMap: - name: zot-config-tpl - items: - - key: config.json - dataFrom: - - extract: - key: github - rewrite: - - regexp: - source: "(.*)" - target: "github_$1" diff --git a/kubernetes/nas/apps/storage/zot/app/helmrelease.yaml b/kubernetes/nas/apps/storage/zot/app/helmrelease.yaml deleted file mode 100644 index efd2fc21d07..00000000000 --- a/kubernetes/nas/apps/storage/zot/app/helmrelease.yaml +++ /dev/null @@ -1,90 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta2.json -apiVersion: helm.toolkit.fluxcd.io/v2beta2 -kind: HelmRelease -metadata: - name: zot -spec: - interval: 30m - chart: - spec: - chart: app-template - version: 2.4.0 - interval: 30m - sourceRef: - kind: HelmRepository - name: bjw-s - namespace: flux-system - - values: - controllers: - main: - annotations: - reloader.stakater.com/auto: "true" - - pod: - securityContext: - runAsUser: 568 - runAsGroup: 568 - fsGroup: 568 - fsGroupChangePolicy: OnRootMismatch - supplementalGroups: - - 65542 # gladius:external-services - - containers: - main: - image: - repository: ghcr.io/project-zot/zot-linux-amd64 - tag: v2.0.0 - probes: - liveness: &probe - enabled: true - custom: true - spec: - httpGet: - path: /v2/ - port: 5000 - initialDelaySeconds: 5 - readiness: *probe - startup: - enabled: false - - service: - main: - ports: - http: - port: 5000 - - ingress: - main: - enabled: true - className: "internal-nginx" - annotations: - nginx.ingress.kubernetes.io/proxy-body-size: "0" - nginx.ingress.kubernetes.io/proxy-read-timeout: "600" - nginx.ingress.kubernetes.io/proxy-send-timeout: "600" - hosts: - - host: &host "zot.bjw-s.dev" - paths: - - path: / - service: - name: main - port: http - tls: - - hosts: - - *host - - persistence: - config-file: - type: secret - name: zot-secret - globalMounts: - - path: /etc/zot/config.json - subPath: config.json - readOnly: true - registry: - type: hostPath - hostPath: /tank/Apps/zot - hostPathType: Directory - globalMounts: - - path: /var/lib/registry diff --git a/kubernetes/nas/apps/storage/zot/app/kustomization.yaml b/kubernetes/nas/apps/storage/zot/app/kustomization.yaml deleted file mode 100644 index aa7274eefa4..00000000000 --- a/kubernetes/nas/apps/storage/zot/app/kustomization.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ./externalsecret.yaml - - ./helmrelease.yaml -configMapGenerator: - - name: zot-config-tpl - files: - - ./config/config.json -generatorOptions: - disableNameSuffixHash: true diff --git a/kubernetes/nas/apps/storage/zot/ks.yaml b/kubernetes/nas/apps/storage/zot/ks.yaml deleted file mode 100644 index 02cd5645131..00000000000 --- a/kubernetes/nas/apps/storage/zot/ks.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &appname zot - namespace: flux-system -spec: - targetNamespace: storage - commonMetadata: - labels: - app.kubernetes.io/name: *appname - interval: 10m - path: "./kubernetes/nas/apps/storage/zot/app" - prune: true - sourceRef: - kind: GitRepository - name: home-ops-kubernetes - wait: false - dependsOn: - - name: external-secrets-stores