From b6234fcbad3f9b3be13f94a563b6b73cbe3741f5 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Mon, 1 Apr 2024 17:56:49 -0400 Subject: [PATCH] fix(spegel): moved to new github org and new update Signed-off-by: Devin Buhl --- README.md | 2 +- .../apps/kube-system/spegel/app/helmrelease.yaml.j2 | 4 ++-- .../kubernetes/flux/repositories/helm/kustomization.yaml.j2 | 4 +--- .../repositories/helm/{xenitab.yaml.j2 => spegel.yaml.j2} | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) rename bootstrap/templates/kubernetes/flux/repositories/helm/{xenitab.yaml.j2 => spegel.yaml.j2} (76%) diff --git a/README.md b/README.md index a76c45d1dc3..5d4d4006c04 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The features included will depend on the type of configuration you want to use. 1. **"Flux cluster"** - a Kubernetes distribution of your choosing: [k3s](https://github.com/k3s-io/k3s) or [Talos](https://github.com/siderolabs/talos). Deploys an opinionated implementation of [Flux](https://github.com/fluxcd/flux2) using [GitHub](https://github.com/) as the Git provider and [sops](https://github.com/getsops/sops) to manage secrets. - **Required:** Debian 12 or Talos Linux installed on bare metal (or VMs) and some knowledge of [Containers](https://opencontainers.org/) and [YAML](https://yaml.org/). Some knowledge of [Git](https://git-scm.com/) practices & terminology is also required. - - **Components:** [Cilium](https://github.com/cilium/cilium) and [kube-vip](https://github.com/kube-vip/kube-vip) _(k3s)_. [flux](https://github.com/fluxcd/flux2), [cert-manager](https://github.com/cert-manager/cert-manager), [spegel](https://github.com/XenitAB/spegel), [reloader](https://github.com/stakater/Reloader), [system-upgrade-controller](https://github.com/rancher/system-upgrade-controller) _(k3s)_, and [openebs](https://github.com/openebs/openebs). + - **Components:** [Cilium](https://github.com/cilium/cilium) and [kube-vip](https://github.com/kube-vip/kube-vip) _(k3s)_. [flux](https://github.com/fluxcd/flux2), [cert-manager](https://github.com/cert-manager/cert-manager), [spegel](https://github.com/spegel-org/spegel), [reloader](https://github.com/stakater/Reloader), [system-upgrade-controller](https://github.com/rancher/system-upgrade-controller) _(k3s)_, and [openebs](https://github.com/openebs/openebs). 3. **"Flux cluster with Cloudflare"** - An addition to "**Flux cluster**" that provides DNS and SSL with [Cloudflare](https://www.cloudflare.com/). [Cloudflare Tunnel](https://www.cloudflare.com/products/tunnel/) is also included to provide external access to certain applications deployed in your cluster. diff --git a/bootstrap/templates/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2 index e14399709aa..8f51712a9f1 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/spegel/app/helmrelease.yaml.j2 @@ -8,10 +8,10 @@ spec: chart: spec: chart: spegel - version: v0.0.18 + version: v0.0.19 sourceRef: kind: HelmRepository - name: xenitab + name: spegel namespace: flux-system install: remediation: diff --git a/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2 index 706bc8cd3f0..2207b7737cf 100644 --- a/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2 +++ b/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2 @@ -14,8 +14,6 @@ resources: - ./openebs.yaml #% if bootstrap_distribution in ["talos"] %# - ./postfinance.yaml + - ./spegel.yaml #% endif %# - ./stakater.yaml - #% if bootstrap_distribution in ["talos"] %# - - ./xenitab.yaml - #% endif %# diff --git a/bootstrap/templates/kubernetes/flux/repositories/helm/xenitab.yaml.j2 b/bootstrap/templates/kubernetes/flux/repositories/helm/spegel.yaml.j2 similarity index 76% rename from bootstrap/templates/kubernetes/flux/repositories/helm/xenitab.yaml.j2 rename to bootstrap/templates/kubernetes/flux/repositories/helm/spegel.yaml.j2 index 83f7ddac7a2..a040b703753 100644 --- a/bootstrap/templates/kubernetes/flux/repositories/helm/xenitab.yaml.j2 +++ b/bootstrap/templates/kubernetes/flux/repositories/helm/spegel.yaml.j2 @@ -3,10 +3,10 @@ apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository metadata: - name: xenitab + name: spegel namespace: flux-system spec: type: oci interval: 5m - url: oci://ghcr.io/xenitab/helm-charts + url: oci://ghcr.io/spegel-org/helm-charts #% endif %#