From c4059140e35ec30fa6b5f85ed569b7dd237aca37 Mon Sep 17 00:00:00 2001 From: Dreaded_X Date: Wed, 17 Dec 2025 00:32:17 +0100 Subject: [PATCH] feat: Move spegel to apps --- clusters/testing/kustomization.yaml | 4 +++- controllers/artifacts.yaml | 5 ----- controllers/spegel/helm-release.yaml | 26 ------------------------- controllers/spegel/helm-repository.yaml | 9 --------- controllers/spegel/kustomization.yaml | 6 ------ controllers/spegel/namespace.yaml | 6 ------ controllers/spegel/spegel.yaml | 15 -------------- 7 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 controllers/spegel/helm-release.yaml delete mode 100644 controllers/spegel/helm-repository.yaml delete mode 100644 controllers/spegel/kustomization.yaml delete mode 100644 controllers/spegel/namespace.yaml delete mode 100644 controllers/spegel/spegel.yaml diff --git a/clusters/testing/kustomization.yaml b/clusters/testing/kustomization.yaml index 54286ad..f34a256 100644 --- a/clusters/testing/kustomization.yaml +++ b/clusters/testing/kustomization.yaml @@ -6,7 +6,6 @@ resources: - ../../controllers/artifacts.yaml - ../../controllers/cilium/cilium.yaml - ../../controllers/cert-manager/cert-manager.yaml - - ../../controllers/spegel/spegel.yaml - ../../controllers/longhorn/longhorn.yaml - ../../controllers/local-path-provisioner/local-path-provisioner.yaml - ../../controllers/cnpg/cnpg.yaml @@ -15,3 +14,6 @@ resources: - ../../configs/certificates/certificates.yaml - ../../configs/alerts/alerts.yaml - ../../configs/longhorn-jobs/longhorn-jobs.yaml + + - ../../apps/artifacts.yaml + - ../../apps/spegel/spegel.yaml diff --git a/controllers/artifacts.yaml b/controllers/artifacts.yaml index d8b7341..ac553b7 100644 --- a/controllers/artifacts.yaml +++ b/controllers/artifacts.yaml @@ -19,11 +19,6 @@ spec: copy: - from: "@foundation/controllers/cert-manager/**" to: "@artifact/" - - name: spegel - originRevision: "@foundation" - copy: - - from: "@foundation/controllers/spegel/**" - to: "@artifact/" - name: openebs originRevision: "@foundation" copy: diff --git a/controllers/spegel/helm-release.yaml b/controllers/spegel/helm-release.yaml deleted file mode 100644 index 6bec366..0000000 --- a/controllers/spegel/helm-release.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: spegel - namespace: spegel -spec: - interval: 12h - install: - strategy: - name: RetryOnFailure - retryInterval: 2m - upgrade: - strategy: - name: RetryOnFailure - retryInterval: 3m - chart: - spec: - chart: spegel - version: "0.5.x" - sourceRef: - kind: HelmRepository - name: spegel - interval: 24h - values: - spegel: - containerdRegistryConfigPath: /etc/cri/conf.d/hosts diff --git a/controllers/spegel/helm-repository.yaml b/controllers/spegel/helm-repository.yaml deleted file mode 100644 index f81c5ab..0000000 --- a/controllers/spegel/helm-repository.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: spegel - namespace: spegel -spec: - type: "oci" - interval: 24h - url: oci://ghcr.io/spegel-org/helm-charts diff --git a/controllers/spegel/kustomization.yaml b/controllers/spegel/kustomization.yaml deleted file mode 100644 index 30ecafd..0000000 --- a/controllers/spegel/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - namespace.yaml - - helm-repository.yaml - - helm-release.yaml diff --git a/controllers/spegel/namespace.yaml b/controllers/spegel/namespace.yaml deleted file mode 100644 index 870a6b3..0000000 --- a/controllers/spegel/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: spegel - labels: - pod-security.kubernetes.io/enforce: privileged diff --git a/controllers/spegel/spegel.yaml b/controllers/spegel/spegel.yaml deleted file mode 100644 index bdf15a1..0000000 --- a/controllers/spegel/spegel.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: spegel - namespace: flux-system -spec: - interval: 1h - retryInterval: 2m - timeout: 5m - sourceRef: - kind: ExternalArtifact - name: spegel - path: ./ - prune: true - wait: true