From 666666f79361332c92b2107c2aca3e10a2f8c379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Thu, 27 Oct 2022 19:49:07 +0200 Subject: [PATCH] convert to helm --- .gitignore | 4 +-- Chart.yaml | 12 ++++++++ base/kustomization.yaml | 28 ------------------- .../antennas-front/Chart.yaml | 0 .../antennas-front/templates/_helpers.tpl | 0 .../antennas-front/templates/deployment.yaml | 0 .../antennas-front/templates/service.yaml | 0 .../antennas-front/values.yaml | 0 .../antennas-incident/Chart.yaml | 0 .../antennas-incident/templates/_helpers.tpl | 0 .../templates/deployment.yaml | 0 .../antennas-incident/templates/service.yaml | 0 .../antennas-incident/values.yaml | 0 prod/kustomization.yaml | 6 ---- {prod => templates}/route.yaml | 0 test/kustomization.yaml | 5 ---- values-prod.yaml | 19 +++++++++++++ values-test.yaml | 19 +++++++++++++ 18 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 Chart.yaml delete mode 100644 base/kustomization.yaml rename {base/charts => charts}/antennas-front/Chart.yaml (100%) rename {base/charts => charts}/antennas-front/templates/_helpers.tpl (100%) rename {base/charts => charts}/antennas-front/templates/deployment.yaml (100%) rename {base/charts => charts}/antennas-front/templates/service.yaml (100%) rename {base/charts => charts}/antennas-front/values.yaml (100%) rename {base/charts => charts}/antennas-incident/Chart.yaml (100%) rename {base/charts => charts}/antennas-incident/templates/_helpers.tpl (100%) rename {base/charts => charts}/antennas-incident/templates/deployment.yaml (100%) rename {base/charts => charts}/antennas-incident/templates/service.yaml (100%) rename {base/charts => charts}/antennas-incident/values.yaml (100%) delete mode 100644 prod/kustomization.yaml rename {prod => templates}/route.yaml (100%) delete mode 100644 test/kustomization.yaml create mode 100644 values-prod.yaml create mode 100644 values-test.yaml diff --git a/.gitignore b/.gitignore index f05baae..275c1cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -base/charts/mariadb -base/charts/mariadb-*.tgz +charts/mariadb +charts/mariadb-*.tgz diff --git a/Chart.yaml b/Chart.yaml new file mode 100644 index 0000000..62c6c06 --- /dev/null +++ b/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v2 +name: antennas +version: 0.0.1 +description: antennas application +dependencies: +- name: antennas-front + version: 0.0.1 +- name: antennas-incident + version: 0.0.1 +- name: mariadb + version: 0.0.1 + repository: https://gitlab.com/api/v4/projects/39850850/packages/helm/stable diff --git a/base/kustomization.yaml b/base/kustomization.yaml deleted file mode 100644 index 9e344fa..0000000 --- a/base/kustomization.yaml +++ /dev/null @@ -1,28 +0,0 @@ -helmCharts: -- name: mariadb - version: 0.1.0 - repo: https://gitlab.com/api/v4/projects/39850850/packages/helm/stable - releaseName: antennas - valuesInline: - db: - dbname: "antennas" - username: "antennas" - password: "secret" - rootpassword: "secret" -- name: antennas-front - version: 0.0.1 - releaseName: antennas-front - valuesInline: - incident: - apikey: super-secret - url: http://antennas-incident:8080 -- name: antennas-incident - version: 0.0.1 - releaseName: antennas-incident - valuesInline: - apikey: super-secret - db: - hostname: "antennas-mariadb" - dbname: "antennas" - username: "antennas" - password: "secret" diff --git a/base/charts/antennas-front/Chart.yaml b/charts/antennas-front/Chart.yaml similarity index 100% rename from base/charts/antennas-front/Chart.yaml rename to charts/antennas-front/Chart.yaml diff --git a/base/charts/antennas-front/templates/_helpers.tpl b/charts/antennas-front/templates/_helpers.tpl similarity index 100% rename from base/charts/antennas-front/templates/_helpers.tpl rename to charts/antennas-front/templates/_helpers.tpl diff --git a/base/charts/antennas-front/templates/deployment.yaml b/charts/antennas-front/templates/deployment.yaml similarity index 100% rename from base/charts/antennas-front/templates/deployment.yaml rename to charts/antennas-front/templates/deployment.yaml diff --git a/base/charts/antennas-front/templates/service.yaml b/charts/antennas-front/templates/service.yaml similarity index 100% rename from base/charts/antennas-front/templates/service.yaml rename to charts/antennas-front/templates/service.yaml diff --git a/base/charts/antennas-front/values.yaml b/charts/antennas-front/values.yaml similarity index 100% rename from base/charts/antennas-front/values.yaml rename to charts/antennas-front/values.yaml diff --git a/base/charts/antennas-incident/Chart.yaml b/charts/antennas-incident/Chart.yaml similarity index 100% rename from base/charts/antennas-incident/Chart.yaml rename to charts/antennas-incident/Chart.yaml diff --git a/base/charts/antennas-incident/templates/_helpers.tpl b/charts/antennas-incident/templates/_helpers.tpl similarity index 100% rename from base/charts/antennas-incident/templates/_helpers.tpl rename to charts/antennas-incident/templates/_helpers.tpl diff --git a/base/charts/antennas-incident/templates/deployment.yaml b/charts/antennas-incident/templates/deployment.yaml similarity index 100% rename from base/charts/antennas-incident/templates/deployment.yaml rename to charts/antennas-incident/templates/deployment.yaml diff --git a/base/charts/antennas-incident/templates/service.yaml b/charts/antennas-incident/templates/service.yaml similarity index 100% rename from base/charts/antennas-incident/templates/service.yaml rename to charts/antennas-incident/templates/service.yaml diff --git a/base/charts/antennas-incident/values.yaml b/charts/antennas-incident/values.yaml similarity index 100% rename from base/charts/antennas-incident/values.yaml rename to charts/antennas-incident/values.yaml diff --git a/prod/kustomization.yaml b/prod/kustomization.yaml deleted file mode 100644 index 98b10d9..0000000 --- a/prod/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -namespace: antennas-prod -resources: -- route.yaml -- ../base -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization diff --git a/prod/route.yaml b/templates/route.yaml similarity index 100% rename from prod/route.yaml rename to templates/route.yaml diff --git a/test/kustomization.yaml b/test/kustomization.yaml deleted file mode 100644 index eb035a1..0000000 --- a/test/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -namespace: antennas-test -resources: -- ../base -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization diff --git a/values-prod.yaml b/values-prod.yaml new file mode 100644 index 0000000..e017862 --- /dev/null +++ b/values-prod.yaml @@ -0,0 +1,19 @@ +mariadb: + db: + dbname: "antennas" + username: "antennas" + password: "secret" + rootpassword: "secret" +antennas-incident: + fullnameOverride: antennas-incident + apikey: super-secret + db: + hostname: "antennas-mariadb" + dbname: "antennas" + username: "antennas" + password: "secret" +antennas-front: + fullnameOverride: antennas-front + incident: + apikey: super-secret + url: http://antennas-incident:8080 diff --git a/values-test.yaml b/values-test.yaml new file mode 100644 index 0000000..e017862 --- /dev/null +++ b/values-test.yaml @@ -0,0 +1,19 @@ +mariadb: + db: + dbname: "antennas" + username: "antennas" + password: "secret" + rootpassword: "secret" +antennas-incident: + fullnameOverride: antennas-incident + apikey: super-secret + db: + hostname: "antennas-mariadb" + dbname: "antennas" + username: "antennas" + password: "secret" +antennas-front: + fullnameOverride: antennas-front + incident: + apikey: super-secret + url: http://antennas-incident:8080