-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(helm): configure MIW Helm chart to use pgadmin4 subchart PR #209
feat(helm): configure MIW Helm chart to use pgadmin4 subchart
- Loading branch information
Showing
8 changed files
with
103 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,4 +26,3 @@ values-*.yaml | |
| README.md.gotmpl | ||
| .helmdocsignore | ||
| ci/ | ||
| charts/pgadmin4 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| # managed-identity-wallet | ||
|
|
||
|    | ||
|    | ||
|
|
||
| Managed Identity Wallet is supposed to supply a secure data source and data sink for Digital Identity Documents (DID), in order to enable Self-Sovereign Identity founding on those DIDs. | ||
| And at the same it shall support an uninterrupted tracking and tracing and documenting the usage of those DIDs, e.g. within logistical supply chains. | ||
|
|
@@ -77,6 +77,7 @@ See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command document | |
|
|
||
| | Repository | Name | Version | | ||
| |------------|------|---------| | ||
| | file://charts/pgadmin4 | pgadmin4 | 1.19.0 | | ||
| | https://charts.bitnami.com/bitnami | common | 2.x.x | | ||
| | https://charts.bitnami.com/bitnami | keycloak | 15.1.6 | | ||
| | https://charts.bitnami.com/bitnami | postgresql | 11.9.13 | | ||
|
|
@@ -142,6 +143,15 @@ See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command document | |
| | miw.ssi.vcExpiryDate | string | `""` | Verifiable Credential expiry date. Format 'dd-MM-yyyy'. If empty it is set to 31-12-<current year> | | ||
| | nameOverride | string | `""` | String to partially override common.names.fullname template (will maintain the release name) | | ||
| | nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector configuration | | ||
| | pgadmin4.enabled | bool | `false` | Enable to deploy pgAdmin | | ||
| | pgadmin4.env.email | string | `"[email protected]"` | Preset the admin user email | | ||
| | pgadmin4.env.password | string | `"very-secret-password"` | preset password (there is no auto-generated password) | | ||
| | pgadmin4.extraServerDefinitions.enabled | bool | `true` | enable the predefined server for pgadmin | | ||
| | pgadmin4.extraServerDefinitions.servers | object | `{}` | See [here](https://github.com/rowanruseler/helm-charts/blob/9b970b2e419c2300dfbb3f827a985157098a0287/charts/pgadmin4/values.yaml#L84) how to configure the predefined servers | | ||
| | pgadmin4.ingress.annotations | object | `{}` | | | ||
| | pgadmin4.ingress.enabled | bool | `false` | Enagle pgAdmin ingress | | ||
| | pgadmin4.ingress.hosts | list | `[]` | See [here](https://github.com/rowanruseler/helm-charts/blob/9b970b2e419c2300dfbb3f827a985157098a0287/charts/pgadmin4/values.yaml#L104) how to configure the ingress host(s) | | ||
| | pgadmin4.ingress.tls | list | `[]` | See [here](https://github.com/rowanruseler/helm-charts/blob/9b970b2e419c2300dfbb3f827a985157098a0287/charts/pgadmin4/values.yaml#L109) how to configure tls for the ingress host(s) | | ||
| | podAnnotations | object | `{}` | PodAnnotation configuration | | ||
| | podSecurityContext | object | `{}` | PodSecurityContext | | ||
| | postgresql.auth.database | string | `"miw_app"` | Postgresql database to create | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
charts/managed-identity-wallet/templates/pgAdmin-server-definitions.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # /******************************************************************************** | ||
| # * Copyright (c) 2021,2023 Contributors to the Eclipse Foundation | ||
| # * | ||
| # * See the NOTICE file(s) distributed with this work for additional | ||
| # * information regarding copyright ownership. | ||
| # * | ||
| # * This program and the accompanying materials are made available under the | ||
| # * terms of the Apache License, Version 2.0 which is available at | ||
| # * https://www.apache.org/licenses/LICENSE-2.0. | ||
| # * | ||
| # * Unless required by applicable law or agreed to in writing, software | ||
| # * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| # * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| # * License for the specific language governing permissions and limitations | ||
| # * under the License. | ||
| # * | ||
| # * SPDX-License-Identifier: Apache-2.0 | ||
| # ********************************************************************************/ | ||
|
|
||
| {{- if and .Values.pgadmin4.enabled .Values.pgadmin4.extraServerDefinitions.enabled }} | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ .Release.Name }}-pgadmin4-server-definitions | ||
| labels: | ||
| {{- include "pgadmin.labels" . | nindent 4 }} | ||
| data: | ||
| servers.json: |- | ||
| {{- include "common.tplvalues.render" (dict "value" (include "managed-identity-wallet.pgadminServerDefinitions" .) "context" $) | nindent 4 }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,7 +41,7 @@ secrets: {} | |
| envs: {} | ||
|
|
||
| serviceAccount: | ||
| # -- Enable creation of ServiceAccount | ||
| # -- Enable creation of ServiceAccount | ||
| create: true | ||
| # -- Annotations to add to the ServiceAccount | ||
| annotations: {} | ||
|
|
@@ -259,3 +259,47 @@ postgresql: | |
| resourcePolicy: "keep" | ||
| # -- PVC Storage Request for the backup data volume | ||
| size: "8Gi" | ||
|
|
||
| # For more information on how to configure the pgadmin chart see https://artifacthub.io/packages/helm/runix/pgadmin4. | ||
| # (Here we're using a stripped-down version of the pgadmin chart, to just ) | ||
| pgadmin4: | ||
| # -- Enable to deploy pgAdmin | ||
| enabled: false | ||
| env: | ||
| # -- Preset the admin user email | ||
| email: [email protected] | ||
| # -- preset password (there is no auto-generated password) | ||
| password: very-secret-password | ||
| # @ignore | ||
| variables: | ||
| - name: PGADMIN_SERVER_JSON_FILE | ||
| value: /pgadmin4/servers.json | ||
| ingress: | ||
| # -- Enagle pgAdmin ingress | ||
| enabled: false | ||
| annotations: {} | ||
| # -- See [here](https://github.com/rowanruseler/helm-charts/blob/9b970b2e419c2300dfbb3f827a985157098a0287/charts/pgadmin4/values.yaml#L104) how to configure the ingress host(s) | ||
| hosts: [] | ||
| # -- See [here](https://github.com/rowanruseler/helm-charts/blob/9b970b2e419c2300dfbb3f827a985157098a0287/charts/pgadmin4/values.yaml#L109) how to configure tls for the ingress host(s) | ||
| tls: [] | ||
| extraServerDefinitions: | ||
| # -- enable the predefined server for pgadmin | ||
| enabled: true | ||
| # -- See [here](https://github.com/rowanruseler/helm-charts/blob/9b970b2e419c2300dfbb3f827a985157098a0287/charts/pgadmin4/values.yaml#L84) how to configure the predefined servers | ||
| servers: | ||
| # @ignore | ||
| miw-internal-postgresql: | ||
| Name: "MIW internal Postgresql DB" | ||
| Group: "Servers" | ||
| Port: 5432 | ||
| Username: "miw" | ||
| Host: "{{ .Release.Name }}-postgresql" | ||
| SSLMode: "prefer" | ||
| MaintenanceDB: "postgres" | ||
| # @ignore | ||
| extraConfigmapMounts: | ||
| - name: server-definitions | ||
| configMap: "{{ .Release.Name }}-pgadmin4-server-definitions" | ||
| subPath: servers.json | ||
| mountPath: "/pgadmin4/servers.json" | ||
| readOnly: true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters