diff --git a/apps/artifacts.yaml b/apps/artifacts.yaml new file mode 100644 index 0000000..6455b23 --- /dev/null +++ b/apps/artifacts.yaml @@ -0,0 +1,16 @@ +apiVersion: source.extensions.fluxcd.io/v1beta1 +kind: ArtifactGenerator +metadata: + name: apps + namespace: flux-system +spec: + sources: + - alias: foundation + kind: GitRepository + name: flux-system + artifacts: + - name: spegel + originRevision: "@foundation" + copy: + - from: "@foundation/apps/spegel/**" + to: "@artifact/" diff --git a/controllers/spegel/helm-release.yaml b/apps/spegel/helm-release.yaml similarity index 100% rename from controllers/spegel/helm-release.yaml rename to apps/spegel/helm-release.yaml diff --git a/controllers/spegel/helm-repository.yaml b/apps/spegel/helm-repository.yaml similarity index 100% rename from controllers/spegel/helm-repository.yaml rename to apps/spegel/helm-repository.yaml diff --git a/controllers/spegel/kustomization.yaml b/apps/spegel/kustomization.yaml similarity index 100% rename from controllers/spegel/kustomization.yaml rename to apps/spegel/kustomization.yaml diff --git a/controllers/spegel/namespace.yaml b/apps/spegel/namespace.yaml similarity index 100% rename from controllers/spegel/namespace.yaml rename to apps/spegel/namespace.yaml diff --git a/controllers/spegel/spegel.yaml b/apps/spegel/spegel.yaml similarity index 100% rename from controllers/spegel/spegel.yaml rename to apps/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: