From 8525a76bd2defbdd3511c201995d838f7b4e586f Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 21 Sep 2024 08:25:53 +0200 Subject: [PATCH 01/14] tofu-controller --- assets/tofu.png | Bin 0 -> 2940 bytes helm-releases/tofu-controller.yaml | 19 ++++++++++++++ helm-repositories/tofu-controller.yaml | 11 ++++++++ stack-definition.yaml | 35 +++++++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 assets/tofu.png create mode 100644 helm-releases/tofu-controller.yaml create mode 100644 helm-repositories/tofu-controller.yaml diff --git a/assets/tofu.png b/assets/tofu.png new file mode 100644 index 0000000000000000000000000000000000000000..f37d48b813273f6736f956617a6944aea8f2d6e8 GIT binary patch literal 2940 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 mta?*rNQ}P~cl{>-0RR8Y?F Date: Sat, 21 Sep 2024 08:47:43 +0200 Subject: [PATCH 02/14] Update tofu-controller.yaml --- helm-releases/tofu-controller.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/helm-releases/tofu-controller.yaml b/helm-releases/tofu-controller.yaml index d123d7e..f2f8cb7 100644 --- a/helm-releases/tofu-controller.yaml +++ b/helm-releases/tofu-controller.yaml @@ -10,10 +10,12 @@ spec: releaseName: tofu-controller chart: spec: - chart: tofu-controller + chart: tf-controller version: v0.16.0-rc.4 sourceRef: kind: HelmRepository name: tofu-controller interval: 10m + values: + fullnameOverride: tofu-controller {{- end }} From f6ca4aba5531d8780abd11740771507321850fd4 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 21 Sep 2024 09:37:20 +0200 Subject: [PATCH 03/14] Supporting postgres --- helm-releases/postgresql.yaml | 60 +++++++++++++++------------------ helm-repositories/bitnami.yaml | 2 +- helm-repositories/onechart.yaml | 2 +- stack-definition.yaml | 49 +++++++++++++++++++++++++-- 4 files changed, 77 insertions(+), 36 deletions(-) diff --git a/helm-releases/postgresql.yaml b/helm-releases/postgresql.yaml index f018461..fff4f59 100644 --- a/helm-releases/postgresql.yaml +++ b/helm-releases/postgresql.yaml @@ -1,32 +1,9 @@ -{{ if or (or .gimletd.postgresql.install .gimletDashboard.postgresql.install) .gimlet.postgresql.install -}} +{{ if .postgresql.enabled -}} --- -apiVersion: v1 -kind: ConfigMap -metadata: - name: postgres-init - namespace: infrastructure -data: - init.sql: | - {{ if .gimletd.postgresql.install }} - CREATE DATABASE gimletd; - CREATE USER gimletd WITH ENCRYPTED PASSWORD '{{ .gimletd.postgresql.password }}'; - GRANT ALL PRIVILEGES ON DATABASE gimletd to gimletd; - {{- end }} - {{ if .gimletDashboard.postgresql.install }} - CREATE DATABASE gimlet_dashboard; - CREATE USER gimlet_dashboard WITH ENCRYPTED PASSWORD '{{ .gimletDashboard.postgresql.password }}'; - GRANT ALL PRIVILEGES ON DATABASE gimlet_dashboard to gimlet_dashboard; - {{- end }} - {{ if .gimlet.postgresql.install }} - CREATE DATABASE gimlet; - CREATE USER gimlet WITH ENCRYPTED PASSWORD '{{ .gimlet.postgresql.password }}'; - GRANT ALL PRIVILEGES ON DATABASE gimlet to gimlet; - {{- end }} ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta2 +apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: postgresql + name: redis namespace: infrastructure spec: interval: 60m @@ -34,15 +11,34 @@ spec: chart: spec: chart: postgresql - version: 11.6.12 + version: 15.5.31 sourceRef: kind: HelmRepository name: bitnami - interval: 10m + interval: 10mpo values: auth: - postgresPassword: "{{ .gimlet.postgresql.postgresPassword | default .gimletd.postgresql.postgresPassword -}}" - primary: - initdb: - scriptsConfigMap: postgres-init + existingSecret: postgresql-credentials + architecture: standalone + tls: + enabled: true + autoGenerated: true + persistence: + enabled: true + size: 8Gi + persistentVolumeClaimRetentionPolicy: + enabled: true + whenScaled: Retain + whenDeleted: Retain +--- +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + name: postgresql-credentials + namespace: infrastructure + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" +spec: + encryptedData: + postgres-password: {{ .postgresql.encryptedPostgresPassword }} {{- end }} diff --git a/helm-repositories/bitnami.yaml b/helm-repositories/bitnami.yaml index 4df1790..a877af7 100644 --- a/helm-repositories/bitnami.yaml +++ b/helm-repositories/bitnami.yaml @@ -1,4 +1,4 @@ -{{ if or .gimlet.postgresql.install (or .gimletd.postgresql.install .gimletDashboard.postgresql.install) -}} +{{ if .postgresql.enabled -}} --- apiVersion: source.toolkit.fluxcd.io/v1beta1 kind: HelmRepository diff --git a/helm-repositories/onechart.yaml b/helm-repositories/onechart.yaml index 0b5ac34..51a6bda 100644 --- a/helm-repositories/onechart.yaml +++ b/helm-repositories/onechart.yaml @@ -1,4 +1,4 @@ -{{ if or .gimlet.enabled (or .gimletDashboard.enabled (or .gimletd.enabled .gimletAgent.enabled)) -}} +{{ if .gimletAgent.enabled -}} --- apiVersion: source.toolkit.fluxcd.io/v1beta1 kind: HelmRepository diff --git a/stack-definition.yaml b/stack-definition.yaml index f32b661..13f63da 100644 --- a/stack-definition.yaml +++ b/stack-definition.yaml @@ -18,6 +18,8 @@ categories: id: autoscaling - name: "Terraform" id: terraform + - name: "Databases" + id: databases components: - name: Nginx variable: nginx @@ -1298,7 +1300,7 @@ components: "type": "object", "title": "Docker Hub", "properties": { - "displayName": { + "displayName": { "$id": "#/properties/displayName", "type": "string", "title": "Display Name", @@ -1362,7 +1364,7 @@ components: "$id": "#tofuController", "type": "object", "title": "Terraform/OpenTofu workflows", - "description": "A GitOps OpenTofu and Terraform controller for Flux", + "description": "A gitops OpenTofu and Terraform controller for Flux", "properties": { "enabled": { "$id": "#/properties/enabled", @@ -1382,9 +1384,52 @@ components: "metaData": {} } ] + - name: PostgreSQL + variable: postgresql + category: databases + logo: https://www.postgresql.org/media/img/about/press/elephant.png + description: "" + onePager: "" + schema: |- + { + "$schema": "http://json-schema.org/draft-07/schema", + "$id": "#postgresql", + "type": "object", + "title": "PostgreSQL", + "description": "", + "properties": { + "enabled": { + "$id": "#/properties/enabled", + "type": "boolean", + "title": "Enabled" + }, + "encryptedPostgresPassword": { + "$id": "#/properties/encryptedPostgresPassword", + "type": "string", + "title": "Password for the postgres user" + } + } + } + uiSchema: |- + [ + { + "schemaIDs": [ + "#postgresql" + ], + "uiSchema": { + "#postgresql": { + "encryptedPostgresPassword": { + "ui:field": "sealedSecretWidget" + } + } + }, + "metaData": {} + } + ] changeLog: | - ❗ FIX: Updated sealed-secrets version format - 🆕 tofu-controller for Terraform/Tofu workflows + - 🆕 PostgreSQL added. See https://gimlet.io/docs/databases/postgresql for workflow message: | Hey 👋 Laszlo here, the founder of Gimlet.io From a5b67f63efa2d85469a86502f0b5c4bff5a4642b Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 21 Sep 2024 09:42:56 +0200 Subject: [PATCH 04/14] Fixing widget name --- stack-definition.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack-definition.yaml b/stack-definition.yaml index 13f63da..3213ada 100644 --- a/stack-definition.yaml +++ b/stack-definition.yaml @@ -1419,7 +1419,7 @@ components: "uiSchema": { "#postgresql": { "encryptedPostgresPassword": { - "ui:field": "sealedSecretWidget" + "ui:field": "encryptedWidget" } } }, From 34274e94573f042b9a8ff1223a00e06d19d05a6f Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 21 Sep 2024 09:49:00 +0200 Subject: [PATCH 05/14] Fix --- helm-releases/postgresql.yaml | 4 ++-- helm-repositories/bitnami.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/helm-releases/postgresql.yaml b/helm-releases/postgresql.yaml index fff4f59..8225dc8 100644 --- a/helm-releases/postgresql.yaml +++ b/helm-releases/postgresql.yaml @@ -1,9 +1,9 @@ {{ if .postgresql.enabled -}} --- -apiVersion: helm.toolkit.fluxcd.io/v2 +apiVersion: helm.toolkit.fluxcd.io/v2beta2 kind: HelmRelease metadata: - name: redis + name: postgresql namespace: infrastructure spec: interval: 60m diff --git a/helm-repositories/bitnami.yaml b/helm-repositories/bitnami.yaml index a877af7..e3febbb 100644 --- a/helm-repositories/bitnami.yaml +++ b/helm-repositories/bitnami.yaml @@ -8,4 +8,4 @@ metadata: spec: interval: 60m url: https://charts.bitnami.com/bitnami -{{- end }} \ No newline at end of file +{{ end }} \ No newline at end of file From 4237c7a1df7fe3a7b7c57cf88072703a546b22c6 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 21 Sep 2024 09:56:11 +0200 Subject: [PATCH 06/14] Typo --- helm-releases/postgresql.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-releases/postgresql.yaml b/helm-releases/postgresql.yaml index 8225dc8..36b921c 100644 --- a/helm-releases/postgresql.yaml +++ b/helm-releases/postgresql.yaml @@ -15,7 +15,7 @@ spec: sourceRef: kind: HelmRepository name: bitnami - interval: 10mpo + interval: 10m values: auth: existingSecret: postgresql-credentials From c1c9898330387831d9b63ab27890aaa251a0562d Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 07:48:20 +0200 Subject: [PATCH 07/14] Postgres changes --- stack-definition.yaml | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/stack-definition.yaml b/stack-definition.yaml index f51a2b2..0fbcab1 100644 --- a/stack-definition.yaml +++ b/stack-definition.yaml @@ -16,10 +16,8 @@ categories: id: secrets - name: "Autoscaling" id: autoscaling - - name: "Terraform" - id: terraform - - name: "Databases" - id: databases + - name: "Tofu" + id: tofu components: - name: Nginx variable: nginx @@ -1352,9 +1350,9 @@ components: } } ] - - name: Terraform/OpenTofu workflows + - name: OpenTofu workflows variable: tofuController - category: terraform + category: tofu logo: https://raw.githubusercontent.com/gimlet-io/gimlet-stack-reference/main/assets/tofu.png description: "" onePager: "" @@ -1384,11 +1382,11 @@ components: "metaData": {} } ] - - name: PostgreSQL - variable: postgresql - category: databases + - name: Centralized PostgreSQL + variable: postgresqlDatabase + category: tofu logo: https://www.postgresql.org/media/img/about/press/elephant.png - description: "" + description: "Access details of yoru centralized Postgresql instance" onePager: "" schema: |- { @@ -1403,10 +1401,20 @@ components: "type": "boolean", "title": "Enabled" }, - "encryptedPostgresPassword": { - "$id": "#/properties/encryptedPostgresPassword", + "host": { + "$id": "#/properties/host", + "type": "string", + "title": "Host address, eg.: TODO" + }, + "adminUsername": { + "$id": "#/properties/adminUsername", + "type": "string", + "title": "Admin Username" + }, + "adminPassword": { + "$id": "#/properties/adminPassword", "type": "string", - "title": "Password for the postgres user" + "title": "Admin Password" } } } @@ -1418,7 +1426,7 @@ components: ], "uiSchema": { "#postgresql": { - "encryptedPostgresPassword": { + "adminPassword": { "ui:field": "encryptedWidget" } } From ad7ec163ba3e3042e7983f83f92b8e6cbdfa7954 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 08:47:09 +0200 Subject: [PATCH 08/14] Postgres changes --- stack-definition.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stack-definition.yaml b/stack-definition.yaml index 0fbcab1..262f2d0 100644 --- a/stack-definition.yaml +++ b/stack-definition.yaml @@ -16,7 +16,7 @@ categories: id: secrets - name: "Autoscaling" id: autoscaling - - name: "Tofu" + - name: "OpenTofu" id: tofu components: - name: Nginx @@ -1393,7 +1393,7 @@ components: "$schema": "http://json-schema.org/draft-07/schema", "$id": "#postgresql", "type": "object", - "title": "PostgreSQL", + "title": "Centralized PostgreSQL", "description": "", "properties": { "enabled": { @@ -1404,7 +1404,8 @@ components: "host": { "$id": "#/properties/host", "type": "string", - "title": "Host address, eg.: TODO" + "title": "Host address" + "description": "eg.: TODO" }, "adminUsername": { "$id": "#/properties/adminUsername", @@ -1427,7 +1428,7 @@ components: "uiSchema": { "#postgresql": { "adminPassword": { - "ui:field": "encryptedWidget" + "ui:field": "encryptedSingleLineWidget" } } }, From d631d5487b3f23ba4283410b37117373816597c3 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 08:52:12 +0200 Subject: [PATCH 09/14] Postgres changes --- stack-definition.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack-definition.yaml b/stack-definition.yaml index 262f2d0..2ffbe1e 100644 --- a/stack-definition.yaml +++ b/stack-definition.yaml @@ -1404,7 +1404,7 @@ components: "host": { "$id": "#/properties/host", "type": "string", - "title": "Host address" + "title": "Host address", "description": "eg.: TODO" }, "adminUsername": { From d6b3c66d2fd61c13227cdcb5cf18ecb6d1ad1dd8 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 08:53:49 +0200 Subject: [PATCH 10/14] Postgres changes --- stack-definition.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack-definition.yaml b/stack-definition.yaml index 2ffbe1e..f676185 100644 --- a/stack-definition.yaml +++ b/stack-definition.yaml @@ -1405,7 +1405,7 @@ components: "$id": "#/properties/host", "type": "string", "title": "Host address", - "description": "eg.: TODO" + "description": "IP address or host name without port" }, "adminUsername": { "$id": "#/properties/adminUsername", From 10ce210da0258ab590c9db6eec8dc8a6e8e44659 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 09:04:55 +0200 Subject: [PATCH 11/14] .. --- .../centralized-postgresql-ceredentials.yaml | 20 +++++++++++++++++++ stack-definition.yaml | 9 ++------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 manifests/centralized-postgresql-ceredentials.yaml diff --git a/manifests/centralized-postgresql-ceredentials.yaml b/manifests/centralized-postgresql-ceredentials.yaml new file mode 100644 index 0000000..ef87ce2 --- /dev/null +++ b/manifests/centralized-postgresql-ceredentials.yaml @@ -0,0 +1,20 @@ +{{ if .centralizedPostgresql -}} +apiVersion: v1 +kind: ConfigMap +metadata: + name: centralized-postgresql-admin-creds + namespace: flux-system +spec: + host: {{ .centralizedPostgresql.host }} + admin_username: {{ .centralizedPostgresql.adminUsername }} +--- +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + name: centralized-postgresql-admin-creds + namespace: flux-system + annotations: + sealedsecrets.bitnami.com/cluster-wide: "true" +spec: + admin_password: {{ .centralizedPostgresql.adminPassword }} +{{- end }} diff --git a/stack-definition.yaml b/stack-definition.yaml index f676185..1b0c632 100644 --- a/stack-definition.yaml +++ b/stack-definition.yaml @@ -1383,7 +1383,7 @@ components: } ] - name: Centralized PostgreSQL - variable: postgresqlDatabase + variable: centralizedPostgresql category: tofu logo: https://www.postgresql.org/media/img/about/press/elephant.png description: "Access details of yoru centralized Postgresql instance" @@ -1396,16 +1396,11 @@ components: "title": "Centralized PostgreSQL", "description": "", "properties": { - "enabled": { - "$id": "#/properties/enabled", - "type": "boolean", - "title": "Enabled" - }, "host": { "$id": "#/properties/host", "type": "string", "title": "Host address", - "description": "IP address or host name without port" + "description": "IP address or host name without port." }, "adminUsername": { "$id": "#/properties/adminUsername", From 45ba2c71194729bdcb0c085853f492c0219dc4cc Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 09:12:45 +0200 Subject: [PATCH 12/14] .. --- manifests/centralized-postgresql-ceredentials.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/centralized-postgresql-ceredentials.yaml b/manifests/centralized-postgresql-ceredentials.yaml index ef87ce2..4927b28 100644 --- a/manifests/centralized-postgresql-ceredentials.yaml +++ b/manifests/centralized-postgresql-ceredentials.yaml @@ -16,5 +16,6 @@ metadata: annotations: sealedsecrets.bitnami.com/cluster-wide: "true" spec: - admin_password: {{ .centralizedPostgresql.adminPassword }} + encryptedData: + admin_password: {{ .centralizedPostgresql.adminPassword }} {{- end }} From 3609270c07125319c65066dc8e5c9ce1154d3418 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 09:17:17 +0200 Subject: [PATCH 13/14] .. --- manifests/centralized-postgresql-ceredentials.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/centralized-postgresql-ceredentials.yaml b/manifests/centralized-postgresql-ceredentials.yaml index 4927b28..e6ca047 100644 --- a/manifests/centralized-postgresql-ceredentials.yaml +++ b/manifests/centralized-postgresql-ceredentials.yaml @@ -5,8 +5,9 @@ metadata: name: centralized-postgresql-admin-creds namespace: flux-system spec: - host: {{ .centralizedPostgresql.host }} - admin_username: {{ .centralizedPostgresql.adminUsername }} + data: + host: {{ .centralizedPostgresql.host }} + admin_username: {{ .centralizedPostgresql.adminUsername }} --- apiVersion: bitnami.com/v1alpha1 kind: SealedSecret From 96c9bc814dd66e894116c293531fab875a0981fd Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 19 Oct 2024 09:20:11 +0200 Subject: [PATCH 14/14] .. --- manifests/centralized-postgresql-ceredentials.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/centralized-postgresql-ceredentials.yaml b/manifests/centralized-postgresql-ceredentials.yaml index e6ca047..bd7e0ab 100644 --- a/manifests/centralized-postgresql-ceredentials.yaml +++ b/manifests/centralized-postgresql-ceredentials.yaml @@ -4,10 +4,9 @@ kind: ConfigMap metadata: name: centralized-postgresql-admin-creds namespace: flux-system -spec: - data: - host: {{ .centralizedPostgresql.host }} - admin_username: {{ .centralizedPostgresql.adminUsername }} +data: + host: {{ .centralizedPostgresql.host }} + admin_username: {{ .centralizedPostgresql.adminUsername }} --- apiVersion: bitnami.com/v1alpha1 kind: SealedSecret