From 4b1b47e12ca923b03f28350f02b67f212233d47a Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Wed, 9 Apr 2025 20:45:54 +0200 Subject: [PATCH] chore(clustertool): move more things to OCI (mirrors) and remove unused registries --- .../kube-system/cilium/app/helm-release.yaml | 2 +- .../nginx-external/app/helm-release.yaml | 2 +- .../nginx-internal/app/helm-release.yaml | 2 +- .../system/openebs/app/helm-release.yaml | 2 +- .../generic/root/repositories/helm/cilium.yaml | 10 ---------- .../root/repositories/helm/cloudnative-pg.yaml | 2 +- .../generic/root/repositories/helm/coredns.yaml | 10 ---------- .../root/repositories/helm/csi-driver-nfs.yaml | 10 ---------- .../root/repositories/helm/descheduler.yaml | 10 ---------- .../root/repositories/helm/ingress-nginx.yaml | 12 ------------ .../generic/root/repositories/helm/intel.yaml | 10 ---------- .../helm/kubernetes-sigs-metrics-server.yaml | 11 ----------- .../root/repositories/helm/kustomization.yaml | 16 ---------------- .../generic/root/repositories/helm/kyverno.yaml | 11 ----------- .../generic/root/repositories/helm/metallb.yaml | 2 +- .../root/repositories/helm/metrics-server.yaml | 10 ---------- .../helm/node-feature-discovery.yaml | 10 ---------- .../generic/root/repositories/helm/nvidia.yaml | 10 ---------- .../generic/root/repositories/helm/openebs.yaml | 10 ---------- .../generic/root/repositories/helm/piraeus.yaml | 10 ---------- .../root/repositories/helm/postfinance.yaml | 10 ---------- .../generic/root/repositories/helm/stakater.yaml | 11 ----------- .../generic/root/repositories/helm/topolvm.yaml | 10 ---------- website/src/content/docs/guides/gpu/intel.md | 4 ++-- 24 files changed, 8 insertions(+), 189 deletions(-) delete mode 100644 clustertool/embed/generic/root/repositories/helm/cilium.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/coredns.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/csi-driver-nfs.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/descheduler.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/intel.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/kyverno.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/metrics-server.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/node-feature-discovery.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/nvidia.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/openebs.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/piraeus.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/postfinance.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/stakater.yaml delete mode 100644 clustertool/embed/generic/root/repositories/helm/topolvm.yaml diff --git a/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml index ae3e4ef3f81..22d37230e74 100644 --- a/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/kube-system/cilium/app/helm-release.yaml @@ -16,7 +16,7 @@ spec: version: 1.17.2 sourceRef: kind: HelmRepository - name: cilium + name: home-ops-mirror namespace: flux-system interval: 15m timeout: 20m diff --git a/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml index 2a4d3af5084..b6182376606 100644 --- a/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml @@ -13,7 +13,7 @@ spec: version: 4.12.1 sourceRef: kind: HelmRepository - name: ingress-nginx + name: home-ops-mirror namespace: flux-system interval: 15m timeout: 20m diff --git a/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml index 0f0bdcd4378..642f56e4f69 100644 --- a/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml @@ -13,7 +13,7 @@ spec: version: 4.12.1 sourceRef: kind: HelmRepository - name: ingress-nginx + name: home-ops-mirror namespace: flux-system interval: 15m timeout: 20m diff --git a/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml index 3b0f7801325..c16e84ff37c 100644 --- a/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/openebs/app/helm-release.yaml @@ -12,7 +12,7 @@ spec: version: 4.2.0 sourceRef: kind: HelmRepository - name: openebs + name: home-ops-mirror namespace: flux-system install: createNamespace: true diff --git a/clustertool/embed/generic/root/repositories/helm/cilium.yaml b/clustertool/embed/generic/root/repositories/helm/cilium.yaml deleted file mode 100644 index 2cd7146d9dd..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/cilium.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: cilium - namespace: flux-system -spec: - interval: 2h - url: https://helm.cilium.io diff --git a/clustertool/embed/generic/root/repositories/helm/cloudnative-pg.yaml b/clustertool/embed/generic/root/repositories/helm/cloudnative-pg.yaml index 4b2f0e61545..55f92162f12 100644 --- a/clustertool/embed/generic/root/repositories/helm/cloudnative-pg.yaml +++ b/clustertool/embed/generic/root/repositories/helm/cloudnative-pg.yaml @@ -7,4 +7,4 @@ metadata: namespace: flux-system spec: interval: 2h - url: https://cloudnative-pg.github.io/charts + url: oci://ghcr.io/cloudnative-pg/charts/cloudnative-pg diff --git a/clustertool/embed/generic/root/repositories/helm/coredns.yaml b/clustertool/embed/generic/root/repositories/helm/coredns.yaml deleted file mode 100644 index ed0bb65a968..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/coredns.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: coredns - namespace: flux-system -spec: - interval: 2h - url: https://coredns.github.io/helm diff --git a/clustertool/embed/generic/root/repositories/helm/csi-driver-nfs.yaml b/clustertool/embed/generic/root/repositories/helm/csi-driver-nfs.yaml deleted file mode 100644 index 869fce39573..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/csi-driver-nfs.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: csi-driver-nfs - namespace: flux-system -spec: - interval: 2h - url: https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts diff --git a/clustertool/embed/generic/root/repositories/helm/descheduler.yaml b/clustertool/embed/generic/root/repositories/helm/descheduler.yaml deleted file mode 100644 index 147045cd2d4..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/descheduler.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: descheduler - namespace: flux-system -spec: - interval: 2h - url: https://kubernetes-sigs.github.io/descheduler diff --git a/clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml b/clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml deleted file mode 100644 index ab3e70e5a1f..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: ingress-nginx - namespace: flux-system -spec: - ## TODO: move to OCI - # type: oci - interval: 5m - url: https://kubernetes.github.io/ingress-nginx diff --git a/clustertool/embed/generic/root/repositories/helm/intel.yaml b/clustertool/embed/generic/root/repositories/helm/intel.yaml deleted file mode 100644 index fb2c66b0870..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/intel.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: intel - namespace: flux-system -spec: - interval: 2h - url: https://intel.github.io/helm-charts diff --git a/clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml b/clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml deleted file mode 100644 index 927bf0ff91e..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/kubernetes-sigs-metrics-server.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: kubernetes-sigs-metrics-server - namespace: flux-system -spec: - interval: 30m - url: https://kubernetes-sigs.github.io/metrics-server/ - timeout: 3m diff --git a/clustertool/embed/generic/root/repositories/helm/kustomization.yaml b/clustertool/embed/generic/root/repositories/helm/kustomization.yaml index 517176c306d..30d8d7bbc1f 100644 --- a/clustertool/embed/generic/root/repositories/helm/kustomization.yaml +++ b/clustertool/embed/generic/root/repositories/helm/kustomization.yaml @@ -5,29 +5,13 @@ metadata: namespace: flux-system resources: - bjw-s.yaml - - cilium.yaml - cloudnative-pg.yaml - - coredns.yaml - - csi-driver-nfs.yaml - - descheduler.yaml - home-ops-mirror.yaml - - ingress-nginx.yaml - - intel.yaml - jetstack.yaml - - kubernetes-sigs-metrics-server.yaml - kustomization.yaml - - kyverno.yaml - longhorn.yaml - metallb.yaml - - metrics-server.yaml - - node-feature-discovery.yaml - - nvidia.yaml - - openebs.yaml - - piraeus.yaml - - postfinance.yaml - prometheus-community.yaml - spegel.yaml - - stakater.yaml - - topolvm.yaml - truecharts.yaml # more goes here! diff --git a/clustertool/embed/generic/root/repositories/helm/kyverno.yaml b/clustertool/embed/generic/root/repositories/helm/kyverno.yaml deleted file mode 100644 index b86efb0a7ad..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/kyverno.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: kyverno - namespace: flux-system -spec: - type: oci - interval: 5m - url: oci://ghcr.io/kyverno/charts diff --git a/clustertool/embed/generic/root/repositories/helm/metallb.yaml b/clustertool/embed/generic/root/repositories/helm/metallb.yaml index 70110d4cb2c..6b14799cb52 100644 --- a/clustertool/embed/generic/root/repositories/helm/metallb.yaml +++ b/clustertool/embed/generic/root/repositories/helm/metallb.yaml @@ -7,5 +7,5 @@ metadata: namespace: flux-system spec: interval: 10m - url: https://metallb.github.io/metallb + url: oci://quay.io/metallb/charts timeout: 3m diff --git a/clustertool/embed/generic/root/repositories/helm/metrics-server.yaml b/clustertool/embed/generic/root/repositories/helm/metrics-server.yaml deleted file mode 100644 index 5b2d20f03a5..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/metrics-server.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: metrics-server - namespace: flux-system -spec: - interval: 2h - url: https://kubernetes-sigs.github.io/metrics-server diff --git a/clustertool/embed/generic/root/repositories/helm/node-feature-discovery.yaml b/clustertool/embed/generic/root/repositories/helm/node-feature-discovery.yaml deleted file mode 100644 index 5e45d5a828f..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/node-feature-discovery.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: node-feature-discovery - namespace: flux-system -spec: - interval: 2h - url: https://kubernetes-sigs.github.io/node-feature-discovery/charts diff --git a/clustertool/embed/generic/root/repositories/helm/nvidia.yaml b/clustertool/embed/generic/root/repositories/helm/nvidia.yaml deleted file mode 100644 index 15b22d74d50..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/nvidia.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: nvidia - namespace: flux-system -spec: - interval: 2h - url: https://helm.ngc.nvidia.com/nvidia diff --git a/clustertool/embed/generic/root/repositories/helm/openebs.yaml b/clustertool/embed/generic/root/repositories/helm/openebs.yaml deleted file mode 100644 index 139303866eb..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/openebs.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: openebs - namespace: flux-system -spec: - interval: 2h - url: https://openebs.github.io/openebs diff --git a/clustertool/embed/generic/root/repositories/helm/piraeus.yaml b/clustertool/embed/generic/root/repositories/helm/piraeus.yaml deleted file mode 100644 index 4fe31ddb0ef..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/piraeus.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: piraeus - namespace: flux-system -spec: - interval: 2h - url: https://piraeus.io/helm-charts/ diff --git a/clustertool/embed/generic/root/repositories/helm/postfinance.yaml b/clustertool/embed/generic/root/repositories/helm/postfinance.yaml deleted file mode 100644 index 015568bfcf7..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/postfinance.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: postfinance - namespace: flux-system -spec: - interval: 2h - url: https://postfinance.github.io/kubelet-csr-approver diff --git a/clustertool/embed/generic/root/repositories/helm/stakater.yaml b/clustertool/embed/generic/root/repositories/helm/stakater.yaml deleted file mode 100644 index 838185d0666..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/stakater.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: stakater - namespace: flux-system -spec: - type: oci - interval: 5m - url: oci://ghcr.io/stakater/charts diff --git a/clustertool/embed/generic/root/repositories/helm/topolvm.yaml b/clustertool/embed/generic/root/repositories/helm/topolvm.yaml deleted file mode 100644 index 3b438b609df..00000000000 --- a/clustertool/embed/generic/root/repositories/helm/topolvm.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: topolvm - namespace: flux-system -spec: - interval: 2h - url: https://topolvm.github.io/topolvm diff --git a/website/src/content/docs/guides/gpu/intel.md b/website/src/content/docs/guides/gpu/intel.md index 51131e1344b..a542c7f9d51 100644 --- a/website/src/content/docs/guides/gpu/intel.md +++ b/website/src/content/docs/guides/gpu/intel.md @@ -83,7 +83,7 @@ spec: version: 0.32.0 sourceRef: kind: HelmRepository - name: intel + name: home-ops-mirror namespace: flux-system install: crds: CreateReplace @@ -126,7 +126,7 @@ spec: version: 0.32.0 sourceRef: kind: HelmRepository - name: intel + name: home-ops-mirror namespace: flux-system install: remediation: