From b229b8b4e5a1275571821c3c3f5e43511e05b73a Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Fri, 17 May 2024 22:03:50 +0200
Subject: [PATCH] Fixed the chart and added documentation

---
 helm/dbrepo/Chart.lock                 |   7 +-
 helm/dbrepo/README.md                  |  19 +--
 helm/dbrepo/templates/auth-secret.yaml |  13 --
 helm/dbrepo/values.schema.json         | 205 ++++++++-----------------
 helm/dbrepo/values.yaml                |   7 +-
 5 files changed, 81 insertions(+), 170 deletions(-)
 delete mode 100644 helm/dbrepo/templates/auth-secret.yaml

diff --git a/helm/dbrepo/Chart.lock b/helm/dbrepo/Chart.lock
index c468b2a409..e7fbf0ea09 100644
--- a/helm/dbrepo/Chart.lock
+++ b/helm/dbrepo/Chart.lock
@@ -11,9 +11,6 @@ dependencies:
 - name: mariadb-galera
   repository: https://charts.bitnami.com/bitnami
   version: 11.0.1
-- name: postgresql-ha
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.1.7
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
   version: 14.0.0
@@ -23,5 +20,5 @@ dependencies:
 - name: tusd
   repository: https://charts.sagikazarmark.dev
   version: 0.1.2
-digest: sha256:4333491b03ef44cc76010790d1b94075b8964bdc473fcf58dc4a54bca8f9adbf
-generated: "2024-05-16T19:02:57.574235186+02:00"
+digest: sha256:f724e33944ae5284b9417a3424a4af9cd67eb8bea0baa0ebeddc76f4c0c9c63a
+generated: "2024-05-17T21:25:35.919266246+02:00"
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 09372a9501..cde2c105fe 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -95,13 +95,14 @@ The command removes all the Kubernetes components associated with the chart and
 
 ### Data Database
 
-| Name                       | Description                                                 | Value    |
-| -------------------------- | ----------------------------------------------------------- | -------- |
-| `datadb.enabled`           | Enable the Data Database.                                   | `true`   |
-| `datadb.image.debug`       | Set the logging level to `trace`. Otherwise, set to `info`. | `false`  |
-| `datadb.rootUser.user`     | The root username.                                          | `root`   |
-| `datadb.rootUser.password` | The root user password.                                     | `dbrepo` |
-| `datadb.replicaCount`      | The number of replicas, should be uneven (2n+1).            | `3`      |
+| Name                         | Description                                                 | Value    |
+| ---------------------------- | ----------------------------------------------------------- | -------- |
+| `datadb.enabled`             | Enable the Data Database.                                   | `true`   |
+| `datadb.image.debug`         | Set the logging level to `trace`. Otherwise, set to `info`. | `false`  |
+| `datadb.rootUser.user`       | The root username.                                          | `root`   |
+| `datadb.rootUser.password`   | The root user password.                                     | `dbrepo` |
+| `datadb.persistence.enabled` | Enable persistent storage. Requires PV-provisioner.         | `false`  |
+| `datadb.replicaCount`        | The number of replicas, should be uneven (2n+1).            | `3`      |
 
 ### Search Database
 
@@ -113,7 +114,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `searchdb.username`            | The admin username.                                 | `admin`     |
 | `searchdb.password`            | The admin user password.                            | `admin`     |
 | `searchdb.replicas`            | The number of replicas.                             | `3`         |
-| `searchdb.persistence.enabled` | Enable persistent storage. Requires PV-provisioner. | `true`      |
+| `searchdb.persistence.enabled` | Enable persistent storage. Requires PV-provisioner. | `false`     |
 
 ### Upload Service
 
@@ -164,7 +165,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `metadataservice.s3.endpoint`              | The S3-capable endpoint the microservice connects to.                 | `http://storageservice-s3:9000` |
 | `metadataservice.s3.auth.username`         | The S3-capable endpoint username (or access key id).                  | `seaweedfsadmin`                |
 | `metadataservice.s3.auth.password`         | The S3-capable endpoint user password (or access key secret).         | `seaweedfsadmin`                |
-| `metadataservice.replicaCount`             | The number of replicas.                                               | `1`                             |
+| `metadataservice.replicaCount`             | The number of replicas.                                               | `2`                             |
 
 ### Data Service
 
diff --git a/helm/dbrepo/templates/auth-secret.yaml b/helm/dbrepo/templates/auth-secret.yaml
deleted file mode 100644
index d5de50dc23..0000000000
--- a/helm/dbrepo/templates/auth-secret.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if .Values.authservice.enabled }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: auth-service-secret
-  namespace: {{ .Values.namespace }}
-stringData:
-  db-host: "{{ .Values.authdb.host }}"
-  db-port: "{{ .Values.authdb.port }}"
-  db-name: "{{ .Values.authdb.postgresql.database }}"
-  db-username: "{{ .Values.authdb.postgresql.username }}"
-  db-password: "{{ .Values.authdb.postgresql.password }}"
-{{- end }}
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index 4d1825c403..b325533b9c 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -45,94 +45,6 @@
             },
             "type": "object"
         },
-        "authdb": {
-            "properties": {
-                "enabled": {
-                    "type": "boolean"
-                },
-                "fullnameOverride": {
-                    "type": "string"
-                },
-                "host": {
-                    "type": "string"
-                },
-                "metrics": {
-                    "properties": {
-                        "enabled": {
-                            "type": "boolean"
-                        }
-                    },
-                    "type": "object"
-                },
-                "persistence": {
-                    "properties": {
-                        "enabled": {
-                            "type": "boolean"
-                        },
-                        "size": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
-                "pgpool": {
-                    "properties": {
-                        "adminPassword": {
-                            "type": "string"
-                        },
-                        "adminUsername": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
-                "port": {
-                    "type": "integer"
-                },
-                "postgresql": {
-                    "properties": {
-                        "database": {
-                            "type": "string"
-                        },
-                        "password": {
-                            "type": "string"
-                        },
-                        "postgresPassword": {
-                            "type": "string"
-                        },
-                        "replicaCount": {
-                            "type": "integer"
-                        },
-                        "repmgrPassword": {
-                            "type": "string"
-                        },
-                        "username": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
-                "service": {
-                    "properties": {
-                        "annotations": {
-                            "properties": {},
-                            "type": "object"
-                        },
-                        "loadBalancerIP": {
-                            "type": "string"
-                        },
-                        "loadBalancerSourceRanges": {
-                            "type": "array"
-                        },
-                        "type": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
         "authservice": {
             "properties": {
                 "auth": {
@@ -163,29 +75,6 @@
                 "endpoint": {
                     "type": "string"
                 },
-                "externalDatabase": {
-                    "properties": {
-                        "existingSecret": {
-                            "type": "string"
-                        },
-                        "existingSecretDatabaseKey": {
-                            "type": "string"
-                        },
-                        "existingSecretHostKey": {
-                            "type": "string"
-                        },
-                        "existingSecretPasswordKey": {
-                            "type": "string"
-                        },
-                        "existingSecretPortKey": {
-                            "type": "string"
-                        },
-                        "existingSecretUserKey": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
                 "extraEnvVarsCM": {
                     "type": "string"
                 },
@@ -254,6 +143,14 @@
                 },
                 "postgresql": {
                     "properties": {
+                        "auth": {
+                            "properties": {
+                                "postgresPassword": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
                         "enabled": {
                             "type": "boolean"
                         }
@@ -376,9 +273,6 @@
                     "properties": {
                         "enabled": {
                             "type": "boolean"
-                        },
-                        "size": {
-                            "type": "string"
                         }
                     },
                     "type": "object"
@@ -440,16 +334,12 @@
                 "extraVolumes": {
                     "items": {
                         "properties": {
+                            "emptyDir": {
+                                "properties": {},
+                                "type": "object"
+                            },
                             "name": {
                                 "type": "string"
-                            },
-                            "persistentVolumeClaim": {
-                                "properties": {
-                                    "claimName": {
-                                        "type": "string"
-                                    }
-                                },
-                                "type": "object"
                             }
                         },
                         "type": "object"
@@ -491,6 +381,14 @@
                     },
                     "type": "object"
                 },
+                "persistence": {
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
                 "replicaCount": {
                     "type": "integer"
                 },
@@ -505,14 +403,6 @@
                     },
                     "type": "object"
                 },
-                "s3": {
-                    "properties": {
-                        "enabled": {
-                            "type": "boolean"
-                        }
-                    },
-                    "type": "object"
-                },
                 "service": {
                     "properties": {
                         "extraPorts": {
@@ -560,6 +450,28 @@
                             "image": {
                                 "type": "string"
                             },
+                            "livenessProbe": {
+                                "properties": {
+                                    "exec": {
+                                        "properties": {
+                                            "command": {
+                                                "items": {
+                                                    "type": "string"
+                                                },
+                                                "type": "array"
+                                            }
+                                        },
+                                        "type": "object"
+                                    },
+                                    "initialDelaySeconds": {
+                                        "type": "integer"
+                                    },
+                                    "periodSeconds": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "type": "object"
+                            },
                             "name": {
                                 "type": "string"
                             },
@@ -580,6 +492,28 @@
                                 },
                                 "type": "array"
                             },
+                            "readinessProbe": {
+                                "properties": {
+                                    "exec": {
+                                        "properties": {
+                                            "command": {
+                                                "items": {
+                                                    "type": "string"
+                                                },
+                                                "type": "array"
+                                            }
+                                        },
+                                        "type": "object"
+                                    },
+                                    "initialDelaySeconds": {
+                                        "type": "integer"
+                                    },
+                                    "periodSeconds": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "type": "object"
+                            },
                             "securityContext": {
                                 "properties": {
                                     "allowPrivilegeEscalation": {
@@ -1078,14 +1012,6 @@
                 "host": {
                     "type": "string"
                 },
-                "image": {
-                    "properties": {
-                        "debug": {
-                            "type": "boolean"
-                        }
-                    },
-                    "type": "object"
-                },
                 "masterService": {
                     "type": "string"
                 },
@@ -1096,9 +1022,6 @@
                     "properties": {
                         "enabled": {
                             "type": "boolean"
-                        },
-                        "size": {
-                            "type": "string"
                         }
                     },
                     "type": "object"
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 6817e949ff..3b2e12c656 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -129,7 +129,7 @@ authservice:
   extraVolumeMounts:
     - name: config-map
       mountPath: /opt/bitnami/keycloak/data/import
-  replicaCount: 1
+  replicaCount: 2
 
 ## @section Data Database
 
@@ -145,6 +145,7 @@ authservice:
 ## @skip datadb.sidecars
 ## @skip datadb.extraVolumeMounts
 ## @skip datadb.extraVolumes
+## @param datadb.persistence.enabled Enable persistent storage. Requires PV-provisioner.
 ## @param datadb.replicaCount The number of replicas, should be uneven (2n+1).
 ##
 datadb:
@@ -213,6 +214,8 @@ datadb:
   extraVolumes:
     - name: s3
       emptyDir: { }
+  persistence:
+    enabled: false
   replicaCount: 3
 
 ## @section Search Database
@@ -249,7 +252,7 @@ searchdb:
   sysctlInit:
     enabled: true
   persistence:
-    enabled: true
+    enabled: false
   service:
     type: ClusterIP
     annotations: { }
-- 
GitLab