From c1ae0407abf1d770f05a60e7df3853dcfd9575a9 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 00:56:10 +0200 Subject: [PATCH 1/9] Add lightmare --- flux/components/kubevirt/ks.yml | 4 ++-- flux/core/lightmare/app/kustomization.yml | 6 ++++++ flux/core/lightmare/app/namespace.yml | 4 ++++ flux/core/lightmare/app/release.yml | 20 +++++++++++++++++++ flux/core/lightmare/app/repository.yml | 8 ++++++++ flux/core/lightmare/ks.yml | 13 ++++++++++++ flux/core/lightmare/kustomization.yml | 4 ++++ .../spectrum/templates/flux-sync.yml | 2 +- 8 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 flux/core/lightmare/app/kustomization.yml create mode 100644 flux/core/lightmare/app/namespace.yml create mode 100644 flux/core/lightmare/app/release.yml create mode 100644 flux/core/lightmare/app/repository.yml create mode 100644 flux/core/lightmare/ks.yml create mode 100644 flux/core/lightmare/kustomization.yml diff --git a/flux/components/kubevirt/ks.yml b/flux/components/kubevirt/ks.yml index a1cacebd..103b7c25 100644 --- a/flux/components/kubevirt/ks.yml +++ b/flux/components/kubevirt/ks.yml @@ -1,11 +1,11 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 kind: Kustomization metadata: - name: kube-virt + name: kubevirt namespace: flux-system spec: interval: 1m0s - path: ./flux/components/kube-virt/app + path: ./flux/components/kubevirt/app prune: true sourceRef: kind: GitRepository diff --git a/flux/core/lightmare/app/kustomization.yml b/flux/core/lightmare/app/kustomization.yml new file mode 100644 index 00000000..5e2cfad0 --- /dev/null +++ b/flux/core/lightmare/app/kustomization.yml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yml + - repository.yml + - release.yml diff --git a/flux/core/lightmare/app/namespace.yml b/flux/core/lightmare/app/namespace.yml new file mode 100644 index 00000000..3ab1abcd --- /dev/null +++ b/flux/core/lightmare/app/namespace.yml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: lightmare diff --git a/flux/core/lightmare/app/release.yml b/flux/core/lightmare/app/release.yml new file mode 100644 index 00000000..45c4e2a1 --- /dev/null +++ b/flux/core/lightmare/app/release.yml @@ -0,0 +1,20 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: lightmare + namespace: lightmare +spec: + interval: 5m + chart: + spec: + chart: lightmare-chart + version: 7.10.0 + sourceRef: + kind: OCIRepository + name: lightmare + namespace: flux-system + values: + image: + repository: fluencelabs/lightmare + tag: main + pullPolicy: Always diff --git a/flux/core/lightmare/app/repository.yml b/flux/core/lightmare/app/repository.yml new file mode 100644 index 00000000..1668c6bc --- /dev/null +++ b/flux/core/lightmare/app/repository.yml @@ -0,0 +1,8 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: OCIRepository +metadata: + name: lightmare + namespace: flux-system +spec: + interval: 5m0s + url: oci://registry-1.docker.io/fluencelabs/lightmare-chart diff --git a/flux/core/lightmare/ks.yml b/flux/core/lightmare/ks.yml new file mode 100644 index 00000000..7db38e49 --- /dev/null +++ b/flux/core/lightmare/ks.yml @@ -0,0 +1,13 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +kind: Kustomization +metadata: + name: lightmare + namespace: flux-system +spec: + interval: 1m0s + path: ./flux/core/lightmare/app + prune: true + sourceRef: + kind: GitRepository + name: spectrum + namespace: flux-system diff --git a/flux/core/lightmare/kustomization.yml b/flux/core/lightmare/kustomization.yml new file mode 100644 index 00000000..d1943374 --- /dev/null +++ b/flux/core/lightmare/kustomization.yml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ks.yaml diff --git a/terraform-modules/spectrum/templates/flux-sync.yml b/terraform-modules/spectrum/templates/flux-sync.yml index 41615ae2..2425bcd9 100644 --- a/terraform-modules/spectrum/templates/flux-sync.yml +++ b/terraform-modules/spectrum/templates/flux-sync.yml @@ -22,5 +22,5 @@ kustomization: kustomizationlist: - spec: interval: 1m0s - path: "./flux/components/lightmare/app" + path: "./flux/core/lightmare/app" prune: true From 58afd04d4d50acb666140bb3a608b6ebdf53ee71 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 00:57:15 +0200 Subject: [PATCH 2/9] f --- flux/core/lightmare/app/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/flux/core/lightmare/app/release.yml b/flux/core/lightmare/app/release.yml index 45c4e2a1..6c9ec3fe 100644 --- a/flux/core/lightmare/app/release.yml +++ b/flux/core/lightmare/app/release.yml @@ -8,7 +8,6 @@ spec: chart: spec: chart: lightmare-chart - version: 7.10.0 sourceRef: kind: OCIRepository name: lightmare From 98d57b2e13f759a38a4b0ad7fb862c878efe60fe Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 01:13:59 +0200 Subject: [PATCH 3/9] F --- .github/workflows/terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml index f4cb1545..1b28d260 100644 --- a/.github/workflows/terraform.yml +++ b/.github/workflows/terraform.yml @@ -113,7 +113,7 @@ jobs: terraform state rm \ module.spectrum.helm_release.flux-sync \ module.spectrum.helm_release.flux \ - module.spectrum.helm_release.cilium + module.spectrum.helm_release.cilium || true terraform destroy -auto-approve terraform workspace delete ${{ steps.sanitize.outputs.workspace }} ;; From 51315fc923a51d7ad396b62e6ae587d2877f1c40 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 01:26:33 +0200 Subject: [PATCH 4/9] F --- flux/core/lightmare/app/repository.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/core/lightmare/app/repository.yml b/flux/core/lightmare/app/repository.yml index 1668c6bc..15436a24 100644 --- a/flux/core/lightmare/app/repository.yml +++ b/flux/core/lightmare/app/repository.yml @@ -1,4 +1,4 @@ -apiVersion: source.toolkit.fluxcd.io/v1 +apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: OCIRepository metadata: name: lightmare From dab0ef7456c1ebe0a9c6e0e020ea0b7a5dd7b572 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 01:32:12 +0200 Subject: [PATCH 5/9] Fu --- flux/core/lightmare/app/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/core/lightmare/app/release.yml b/flux/core/lightmare/app/release.yml index 6c9ec3fe..b822acee 100644 --- a/flux/core/lightmare/app/release.yml +++ b/flux/core/lightmare/app/release.yml @@ -9,7 +9,7 @@ spec: spec: chart: lightmare-chart sourceRef: - kind: OCIRepository + kind: HelmRepository name: lightmare namespace: flux-system values: From 07176af2ed66165225da940dcef971ba61347399 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 01:35:01 +0200 Subject: [PATCH 6/9] F --- flux/core/lightmare/app/repository.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flux/core/lightmare/app/repository.yml b/flux/core/lightmare/app/repository.yml index 15436a24..65a4c012 100644 --- a/flux/core/lightmare/app/repository.yml +++ b/flux/core/lightmare/app/repository.yml @@ -6,3 +6,5 @@ metadata: spec: interval: 5m0s url: oci://registry-1.docker.io/fluencelabs/lightmare-chart + ref: + tag: 0.1.0 From 95482e8bc078778e054f6015b9b222fd775c933b Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 01:36:47 +0200 Subject: [PATCH 7/9] F --- flux/core/lightmare/app/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/core/lightmare/app/release.yml b/flux/core/lightmare/app/release.yml index b822acee..6c9ec3fe 100644 --- a/flux/core/lightmare/app/release.yml +++ b/flux/core/lightmare/app/release.yml @@ -9,7 +9,7 @@ spec: spec: chart: lightmare-chart sourceRef: - kind: HelmRepository + kind: OCIRepository name: lightmare namespace: flux-system values: From af713d3bdfbfecc3ab85fba69d899bbefc218aa4 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 01:44:04 +0200 Subject: [PATCH 8/9] F --- flux/core/lightmare/app/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flux/core/lightmare/app/release.yml b/flux/core/lightmare/app/release.yml index 6c9ec3fe..0f8f0b3f 100644 --- a/flux/core/lightmare/app/release.yml +++ b/flux/core/lightmare/app/release.yml @@ -7,10 +7,9 @@ spec: interval: 5m chart: spec: - chart: lightmare-chart - sourceRef: + chartRef: kind: OCIRepository - name: lightmare + name: lightmare-chart namespace: flux-system values: image: From aad3a83fe58c6a4a48b32fdc27b3d9e58dbccd64 Mon Sep 17 00:00:00 2001 From: Anatolios Laskaris Date: Thu, 5 Dec 2024 01:47:22 +0200 Subject: [PATCH 9/9] F --- flux/core/lightmare/app/release.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/flux/core/lightmare/app/release.yml b/flux/core/lightmare/app/release.yml index 0f8f0b3f..647d7be6 100644 --- a/flux/core/lightmare/app/release.yml +++ b/flux/core/lightmare/app/release.yml @@ -5,12 +5,10 @@ metadata: namespace: lightmare spec: interval: 5m - chart: - spec: - chartRef: - kind: OCIRepository - name: lightmare-chart - namespace: flux-system + chartRef: + kind: OCIRepository + name: lightmare + namespace: flux-system values: image: repository: fluencelabs/lightmare