From 69517b47e7eb46572751cc8d4c3baadc3cc9e9ba Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Wed, 19 Feb 2025 12:56:11 +0100 Subject: [PATCH 1/3] feat: Add Quickchart deps on common-services --- flux/kustomizations/kustomization.yaml | 23 ++++++++-------- flux/kustomizations/quickchart.yaml | 26 +++++++++++++++++++ infrastructure/quickchart/helm-release.yaml | 19 ++++++++++++++ .../quickchart/helm-repository.yaml | 8 ++++++ infrastructure/quickchart/kustomization.yaml | 5 ++++ 5 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 flux/kustomizations/quickchart.yaml create mode 100644 infrastructure/quickchart/helm-release.yaml create mode 100644 infrastructure/quickchart/helm-repository.yaml create mode 100644 infrastructure/quickchart/kustomization.yaml diff --git a/flux/kustomizations/kustomization.yaml b/flux/kustomizations/kustomization.yaml index d6bf89a..06062b6 100644 --- a/flux/kustomizations/kustomization.yaml +++ b/flux/kustomizations/kustomization.yaml @@ -1,14 +1,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - cert-manager.yaml - - flux-resources.yaml - - gitlab-agent.yaml - - gitlab-runner.yaml - - hashicorp-vault.yaml - - ldc-custom.yaml - - mariadb.yaml - - meilisearch.yaml - - namespaces.yaml - - prometheus-stack.yaml - - traefik.yaml +- cert-manager.yaml +- flux-resources.yaml +- gitlab-agent.yaml +- gitlab-runner.yaml +- hashicorp-vault.yaml +- ldc-custom.yaml +- mariadb.yaml +- meilisearch.yaml +- namespaces.yaml +- prometheus-stack.yaml +- traefik.yaml +- quickchart.yaml diff --git a/flux/kustomizations/quickchart.yaml b/flux/kustomizations/quickchart.yaml new file mode 100644 index 0000000..6bf8a30 --- /dev/null +++ b/flux/kustomizations/quickchart.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: quickchart + namespace: flux-system +spec: + interval: 1m0s + path: ./infrastructure/quickchart + prune: false + healthChecks: + - apiVersion: source.toolkit.fluxcd.io/v1 + kind: HelmRepository + name: quickchart + namespace: common-services + - apiVersion: helm.toolkit.fluxcd.io/v2 + kind: HelmRelease + name: quickchart + namespace: common-services + dependsOn: + - name: namespaces + namespace: flux-system + sourceRef: + kind: GitRepository + name: cluster-k8s + timeout: 5m diff --git a/infrastructure/quickchart/helm-release.yaml b/infrastructure/quickchart/helm-release.yaml new file mode 100644 index 0000000..f560602 --- /dev/null +++ b/infrastructure/quickchart/helm-release.yaml @@ -0,0 +1,19 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: quickchart + namespace: common-services +spec: + interval: 1m0s + chart: + spec: + chart: cowboysysop/quickchart + version: 4.1.0 + sourceRef: + kind: HelmRepository + name: quickchart + namespace: common-services + values: + image: + tag: 1.8.1 diff --git a/infrastructure/quickchart/helm-repository.yaml b/infrastructure/quickchart/helm-repository.yaml new file mode 100644 index 0000000..dbe991c --- /dev/null +++ b/infrastructure/quickchart/helm-repository.yaml @@ -0,0 +1,8 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: HelmRepository +metadata: + name: quickchart + namespace: common-services +spec: + interval: 1h0m0s + url: https://cowboysysop.github.io/charts/ diff --git a/infrastructure/quickchart/kustomization.yaml b/infrastructure/quickchart/kustomization.yaml new file mode 100644 index 0000000..e015cab --- /dev/null +++ b/infrastructure/quickchart/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- helm-repository.yaml +- helm-release.yaml From b26aea204e9f3120cbffa864acaeaed1f06610f0 Mon Sep 17 00:00:00 2001 From: Thibault Raquet Date: Wed, 19 Feb 2025 15:45:30 +0000 Subject: [PATCH 2/3] Update helm-release.yaml --- infrastructure/quickchart/helm-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/quickchart/helm-release.yaml b/infrastructure/quickchart/helm-release.yaml index f560602..653c492 100644 --- a/infrastructure/quickchart/helm-release.yaml +++ b/infrastructure/quickchart/helm-release.yaml @@ -8,7 +8,7 @@ spec: interval: 1m0s chart: spec: - chart: cowboysysop/quickchart + chart: quickchart version: 4.1.0 sourceRef: kind: HelmRepository From 4ea57d8e842bd9f3684378018697d6a67b94d773 Mon Sep 17 00:00:00 2001 From: Thibault Raquet Date: Wed, 19 Feb 2025 15:50:25 +0000 Subject: [PATCH 3/3] Update helm-release.yaml --- infrastructure/quickchart/helm-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/quickchart/helm-release.yaml b/infrastructure/quickchart/helm-release.yaml index 653c492..6353a02 100644 --- a/infrastructure/quickchart/helm-release.yaml +++ b/infrastructure/quickchart/helm-release.yaml @@ -16,4 +16,4 @@ spec: namespace: common-services values: image: - tag: 1.8.1 + tag: v1.8.1