diff --git a/infra/charts/turing/Chart.yaml b/infra/charts/turing/Chart.yaml index f0fd6c968..27fc4ff3f 100644 --- a/infra/charts/turing/Chart.yaml +++ b/infra/charts/turing/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 description: "Turing: ML Experimentation System" name: turing -version: 0.2.9 +version: 0.2.10 appVersion: v1.0.0 diff --git a/infra/charts/turing/README.md b/infra/charts/turing/README.md index dcbc4d85b..70cc77962 100644 --- a/infra/charts/turing/README.md +++ b/infra/charts/turing/README.md @@ -71,15 +71,19 @@ The following table lists the configurable parameters of the Turing chart and th | global.sentry.dsn | string | `nil` | Global Sentry DSN value | | merlin.environmentConfigs | list | computed value | List of Merlin environment configs, available to Turing for deploying routers By default, a new dev environment will automatically be created | | merlin.mlpApi.apiHost | string | computed value | API endpoint to be used by Merlin to talk to MLP API | -| merlin.postgresql | object | `{"nameOverride":"postgresql-merlin","postgresqlPassword":"merlin"}` | Postgresql configuration to be applied to Merlin's's postgresql database deployment Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/8.9.8#parameters | +| merlin.postgresql | object | `{"nameOverride":"postgresql-merlin","postgresqlPassword":"merlin"}` | Postgresql configuration to be applied to Merlin's's postgresql database deployment Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/10.16.2#parameters | | merlin.postgresql.nameOverride | string | `"postgresql-merlin"` | Name of Merlin's Postgresql deployment | | merlin.postgresql.postgresqlPassword | string | `"merlin"` | Password for Merlin Postgresql database | +| merlin.postgresql.tls.enabled | bool | `false`| TLS Setting disabled | +| merlin.postgresql.containerPorts.postgresql | int | `5432`| PostgreSQL container port | | mlp.apiHost | string | `"/api/v1"` | MLP API endpoint, used by the MLP UI for fetching data | | mlp.extraEnvs | list | computed value | List of extra environment variables to add to MLP API container | -| mlp.postgresql | object | `{"nameOverride":"postgresql-mlp","postgresqlPassword":"mlp"}` | Postgresql configuration to be applied to MLP's postgresql database deployment Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/8.9.8#parameters | +| mlp.postgresql | object | `{"nameOverride":"postgresql-mlp","postgresqlPassword":"mlp"}` | Postgresql configuration to be applied to MLP's postgresql database deployment Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/10.16.2#parameters | | mlp.postgresql.nameOverride | string | `"postgresql-mlp"` | Name of MLP's Postgresql deployment | | mlp.postgresql.postgresqlPassword | string | `"mlp"` | Password for MLP Postgresql database | -| postgresql | object | `{"metrics":{"enabled":false,"replication":{"applicationName":"turing","enabled":false,"numSynchronousReplicas":2,"password":"repl_password","slaveReplicas":2,"synchronousCommit":"on","user":"repl_user"},"serviceMonitor":{"enabled":false}},"persistence":{"enabled":true,"size":"10Gi"},"postgresqlDatabase":"turing","postgresqlPassword":"turing","postgresqlPort":5432,"postgresqlUsername":"turing","resources":{"requests":{"cpu":"500m","memory":"256Mi"}}}` | Postgresql configuration to be applied to Turing's postgresql database deployment Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/8.9.8#parameters | +| mlp.postgresql.tls.enabled | bool | `false`| TLS Setting disabled | +| mlp.postgresql.containerPorts.postgresql | int | `5432`| PostgreSQL container port | +| postgresql | object | `{"metrics":{"enabled":false,"replication":{"applicationName":"turing","enabled":false,"numSynchronousReplicas":2,"password":"repl_password","slaveReplicas":2,"synchronousCommit":"on","user":"repl_user"},"serviceMonitor":{"enabled":false}},"persistence":{"enabled":true,"size":"10Gi"},"postgresqlDatabase":"turing","postgresqlPassword":"turing","postgresqlUsername":"turing","resources":{"requests":{"cpu":"500m","memory":"256Mi"}},"tls":{"enabled":false},"containerPorts":{"postgresql":5432}}` | Postgresql configuration to be applied to Turing's postgresql database deployment Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/10.16.2#parameters | | postgresql.persistence.enabled | bool | `true` | Persist Postgresql data in a Persistent Volume Claim | | postgresql.postgresqlPassword | string | `"turing"` | Password for Turing Postgresql database | | postgresql.resources | object | `{"requests":{"cpu":"500m","memory":"256Mi"}}` | Resources requests and limits for Turing database. This should be set according to your cluster capacity and service level objectives. Reference: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | diff --git a/infra/charts/turing/charts/merlin-0.7.1.tgz b/infra/charts/turing/charts/merlin-0.7.1.tgz index d82ca8eee..9ae6f0561 100644 Binary files a/infra/charts/turing/charts/merlin-0.7.1.tgz and b/infra/charts/turing/charts/merlin-0.7.1.tgz differ diff --git a/infra/charts/turing/charts/mlp-1.0.1.tgz b/infra/charts/turing/charts/mlp-1.0.1.tgz index 00cf673e1..37f51e170 100644 Binary files a/infra/charts/turing/charts/mlp-1.0.1.tgz and b/infra/charts/turing/charts/mlp-1.0.1.tgz differ diff --git a/infra/charts/turing/charts/postgresql-10.16.2.tgz b/infra/charts/turing/charts/postgresql-10.16.2.tgz new file mode 100644 index 000000000..d3a6d0f8f Binary files /dev/null and b/infra/charts/turing/charts/postgresql-10.16.2.tgz differ diff --git a/infra/charts/turing/charts/postgresql-8.9.8.tgz b/infra/charts/turing/charts/postgresql-8.9.8.tgz deleted file mode 100644 index efe6e983a..000000000 Binary files a/infra/charts/turing/charts/postgresql-8.9.8.tgz and /dev/null differ diff --git a/infra/charts/turing/requirements.lock b/infra/charts/turing/requirements.lock index 769711a7a..51a035910 100644 --- a/infra/charts/turing/requirements.lock +++ b/infra/charts/turing/requirements.lock @@ -1,12 +1,12 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 8.9.8 + version: 10.16.2 - name: mlp repository: file://subcharts/mlp version: 1.0.1 - name: merlin repository: file://subcharts/merlin version: 0.7.1 -digest: sha256:62dbfb1f6d5d038e0d5d4e7f5c5f47c1e637293899136e4347829124e9db364d -generated: "2021-11-16T14:56:44.145523+08:00" +digest: sha256:6f49ea5b08170eeb7493194e4bfb8efa5db363fa8e00e97f94a124a18bb6c84c +generated: "2022-06-10T08:19:37.784556+08:00" diff --git a/infra/charts/turing/requirements.yaml b/infra/charts/turing/requirements.yaml index f1189c94a..181086635 100644 --- a/infra/charts/turing/requirements.yaml +++ b/infra/charts/turing/requirements.yaml @@ -1,7 +1,7 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 8.9.8 + version: 10.16.2 tags: - db - name: mlp diff --git a/infra/charts/turing/subcharts/merlin/charts/postgresql-10.16.2.tgz b/infra/charts/turing/subcharts/merlin/charts/postgresql-10.16.2.tgz new file mode 100644 index 000000000..d3a6d0f8f Binary files /dev/null and b/infra/charts/turing/subcharts/merlin/charts/postgresql-10.16.2.tgz differ diff --git a/infra/charts/turing/subcharts/merlin/charts/postgresql-8.9.8.tgz b/infra/charts/turing/subcharts/merlin/charts/postgresql-8.9.8.tgz deleted file mode 100644 index efe6e983a..000000000 Binary files a/infra/charts/turing/subcharts/merlin/charts/postgresql-8.9.8.tgz and /dev/null differ diff --git a/infra/charts/turing/subcharts/merlin/requirements.lock b/infra/charts/turing/subcharts/merlin/requirements.lock index 6614f49bf..42569ae70 100644 --- a/infra/charts/turing/subcharts/merlin/requirements.lock +++ b/infra/charts/turing/subcharts/merlin/requirements.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 8.9.8 + version: 10.16.2 - name: vault repository: https://helm.releases.hashicorp.com version: 0.16.1 -digest: sha256:03150d3bc9085d7a7686849b04abc7dbba0d88043e6ec527194f4590637eae52 -generated: "2021-11-10T00:36:39.308536+08:00" +digest: sha256:55a15f2ce14e0c9aa44b260b6a4376eecca2ef816eb989fc3d3707b8889edfdb +generated: "2022-06-10T08:21:53.111872+08:00" diff --git a/infra/charts/turing/subcharts/merlin/requirements.yaml b/infra/charts/turing/subcharts/merlin/requirements.yaml index ff5a83af7..da2666bf9 100644 --- a/infra/charts/turing/subcharts/merlin/requirements.yaml +++ b/infra/charts/turing/subcharts/merlin/requirements.yaml @@ -1,7 +1,7 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 8.9.8 + version: 10.16.2 - name: vault repository: https://helm.releases.hashicorp.com version: 0.16.1 diff --git a/infra/charts/turing/subcharts/mlp/charts/postgresql-10.16.2.tgz b/infra/charts/turing/subcharts/mlp/charts/postgresql-10.16.2.tgz new file mode 100644 index 000000000..d3a6d0f8f Binary files /dev/null and b/infra/charts/turing/subcharts/mlp/charts/postgresql-10.16.2.tgz differ diff --git a/infra/charts/turing/subcharts/mlp/charts/postgresql-8.9.8.tgz b/infra/charts/turing/subcharts/mlp/charts/postgresql-8.9.8.tgz deleted file mode 100644 index efe6e983a..000000000 Binary files a/infra/charts/turing/subcharts/mlp/charts/postgresql-8.9.8.tgz and /dev/null differ diff --git a/infra/charts/turing/subcharts/mlp/requirements.lock b/infra/charts/turing/subcharts/mlp/requirements.lock index 712d60a96..810864a19 100644 --- a/infra/charts/turing/subcharts/mlp/requirements.lock +++ b/infra/charts/turing/subcharts/mlp/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 8.9.8 -digest: sha256:ee0dd2adb1e46ed156d7884d3743439b78916fd82057bd6c8b3bce23d91aa335 -generated: "2021-11-09T22:05:24.168419+08:00" + version: 10.16.2 +digest: sha256:e7fac77cc02e2114c9eaa79633bc2e91d3fc748c9e45a5ae69b4f0a47f1df988 +generated: "2022-06-10T08:21:20.487583+08:00" diff --git a/infra/charts/turing/subcharts/mlp/requirements.yaml b/infra/charts/turing/subcharts/mlp/requirements.yaml index 30cb1261a..95a4260f2 100644 --- a/infra/charts/turing/subcharts/mlp/requirements.yaml +++ b/infra/charts/turing/subcharts/mlp/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 8.9.8 + version: 10.16.2 diff --git a/infra/charts/turing/values.yaml b/infra/charts/turing/values.yaml index d6a79084a..6543467db 100644 --- a/infra/charts/turing/values.yaml +++ b/infra/charts/turing/values.yaml @@ -189,7 +189,7 @@ sentry: dsn: "" # -- Postgresql configuration to be applied to Turing's postgresql database deployment -# Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/8.9.8#parameters +# Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/10.16.2#parameters postgresql: # -- Resources requests and limits for Turing database. This should be set # according to your cluster capacity and service level objectives. @@ -203,10 +203,13 @@ postgresql: enabled: true size: 10Gi postgresqlDatabase: turing - postgresqlPort: 5432 postgresqlUsername: turing # -- Password for Turing Postgresql database postgresqlPassword: turing + tls: + enabled: false + containerPorts: + postgresql: 5432 metrics: enabled: false serviceMonitor: @@ -241,22 +244,30 @@ mlp: value: "http://feast.dev/v1" # -- Postgresql configuration to be applied to MLP's postgresql database deployment - # Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/8.9.8#parameters + # Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/10.16.2#parameters postgresql: # -- Name of MLP's Postgresql deployment nameOverride: postgresql-mlp # -- Password for MLP Postgresql database postgresqlPassword: mlp + tls: + enabled: false + containerPorts: + postgresql: 5432 merlin: # -- Postgresql configuration to be applied to Merlin's's postgresql database deployment - # Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/8.9.8#parameters + # Reference: https://artifacthub.io/packages/helm/bitnami/postgresql/10.16.2#parameters postgresql: # -- Name of Merlin's Postgresql deployment nameOverride: postgresql-merlin # -- Password for Merlin Postgresql database postgresqlPassword: merlin + tls: + enabled: false + containerPorts: + postgresql: 5432 mlpApi: # -- API endpoint to be used by Merlin to talk to MLP API