Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/bitnami/charts

Browse Source
This commit is contained in:
Rafael Rios Saavedra
2020-01-14 15:32:32 +00:00
parent 5b152e42d5 dbc1657b8c
commit 3f63c14175
12 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/kube-state-metrics/Chart.yaml
+2 -2
View File
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: 1.9.1
appVersion: 1.9.2
description: kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects.
name: kube-state-metrics
version: 0.1.6
version: 0.1.7
keywords:
- prometheus
- kube-state-metrics
bitnami/kube-state-metrics/values-production.yaml
+1 -1
View File
@@ -51,7 +51,7 @@ serviceAccount:
image:
registry: docker.io
repository: bitnami/kube-state-metrics
tag: 1.9.1-debian-9-r0
tag: 1.9.2-debian-9-r0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
bitnami/kube-state-metrics/values.yaml
+1 -1
View File
@@ -51,7 +51,7 @@ serviceAccount:
image:
registry: docker.io
repository: bitnami/kube-state-metrics
tag: 1.9.1-debian-9-r0
tag: 1.9.2-debian-9-r0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
bitnami/postgresql-ha/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: postgresql-ha
version: 1.1.5
version: 1.2.0
appVersion: 11.6.0
description: Chart for PostgreSQL with HA architecture (using Replication Manager (repmgr) and Pgpool).
keywords:
bitnami/postgresql-ha/README.md
+6 -4
View File
@@ -130,6 +130,8 @@ The following table lists the configurable parameters of the PostgreSQL HA chart
| `pgpool.pdb.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `nil` |
| `pgpool.adminUsername` | Pgpool Admin username | `admin` |
| `pgpool.adminPassword` | Pgpool Admin password | `nil` |
| `pgpool.configuration` | Content of pgpool.conf | `nil` |
| `pgpool.configurationCM` | ConfigMap with the Pgpool configuration file (Note: Overrides `pgpol.configuration`) | `nil` (The value is evaluated as a template) |
| **LDAP** | | |
| `ldap.enabled` | Enable LDAP support | `false` |
| `ldap.existingSecret` | Name of existing secret to use for LDAP passwords | `nil` |
@@ -294,15 +296,15 @@ Next, login to the PostgreSQL server using the `psql` client and add the PAM aut
> Note: Parameters including commas must be escaped as shown in the above example. More information at: https://github.com/helm/helm/blob/master/docs/using_helm.md#the-format-and-limitations-of---set
### repmgr.conf / postgresql.conf / pg_hba.conf files as configMap
### repmgr.conf / postgresql.conf / pg_hba.conf / pgpool.conf files as configMap
This helm chart also supports to customize the whole configuration file.
Add your custom files to "files" in your working directory. Those files will be mounted as configMap to the containers and it will be used for configuring Repmgr and the PostgreSQL server.
Add your custom files to "files" in your working directory. Those files will be mounted as configMap to the containers and it will be used for configuring Pgpool, Repmgr and the PostgreSQL server.
Alternatively, you can specify the PostgreSQL and Repmgr configuration using the `postgresql.configuration`, `postgresql.pgHbaConfiguration`, and `postgresql.repmgrConfiguration` parameters.
Alternatively, you can specify the Pgpool, PostgreSQL and Repmgr configuration using the `pgpool.configuration`, `postgresql.configuration`, `postgresql.pgHbaConfiguration`, and `postgresql.repmgrConfiguration` parameters.
In addition to these options, you can also set an external ConfigMap with all the configuration files. This is done by setting the `postgresql.configurationCM` parameter. Note that this will override the two previous options.
In addition to these options, you can also set an external ConfigMap(s) with all the configuration files. This is done by setting the `postgresql.configurationCM` and `pgpool.configurationCM` parameters. Note that this will override the two previous options.
### Allow settings to be loaded from files other than the default `postgresql.conf`
bitnami/postgresql-ha/templates/_helpers.tpl
+11
View File
@@ -524,6 +524,17 @@ Return the PostgreSQL extended configuration configmap.
{{- end -}}
{{- end -}}
{{/*
Return the Pgpool configuration configmap.
*/}}
{{- define "postgresql-ha.pgpoolConfigurationCM" -}}
{{- if .Values.pgpool.configurationCM -}}
{{- printf "%s" (tpl .Values.pgpool.configurationCM $) -}}
{{- else -}}
{{- printf "%s-configuration" (include "postgresql-ha.pgpool" .) -}}
{{- end -}}
{{- end -}}
{{/*
Return the PostgreSQL initdb scripts configmap.
*/}}
bitnami/postgresql-ha/templates/pgpool/configmap.yaml
+15
View File
@@ -0,0 +1,15 @@
{{- if and (or (.Files.Glob "files/pgpool.conf") .Values.pgpool.configuration) (not .Values.pgpool.configurationCM) }}
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "%s-configuration" (include "postgresql-ha.pgpool" .) }}
labels: {{- include "postgresql-ha.labels" . | nindent 4 }}
app.kubernetes.io/component: pgpool
data:
{{- if (.Files.Glob "files/pgpool.conf") }}
{{- (.Files.Glob "files/pgpool.conf").AsConfig | nindent 2 }}
{{- else if .Values.pgpool.configuration }}
pgpool.conf: |
{{- include "postgresql-ha.tplValue" (dict "value" .Values.pgpool.configuration "context" $) | nindent 4 }}
{{- end }}
{{- end }}
bitnami/postgresql-ha/templates/pgpool/deployment.yaml
+9
View File
@@ -210,6 +210,10 @@ spec:
resources: {{- toYaml .Values.pgpool.resources | nindent 12 }}
{{- end }}
volumeMounts:
{{- if or (.Files.Glob "files/pgool.conf") .Values.pgpool.configuration }}
- name: pgpool-config
mountPath: /opt/bitnami/pgpool/conf/
{{- end }}
{{- if .Values.postgresql.usePasswordFile }}
- name: postgresql-password
mountPath: /opt/bitnami/pgpool/secrets/
@@ -220,6 +224,11 @@ spec:
{{- end }}
{{- if or .Values.postgresql.usePasswordFile .Values.pgpool.usePasswordFile }}
volumes:
{{- if or (.Files.Glob "files/pgool.conf") .Values.pgpool.configuration }}
- name: pgpool-config
configMap:
name: {{ include "postgresql-ha.pgpoolConfigurationCM" . }}
{{- end }}
{{- if .Values.postgresql.usePasswordFile }}
- name: postgresql-password
secret:
bitnami/postgresql-ha/values-production.yaml
+12
View File
@@ -364,6 +364,18 @@ pgpool:
adminUsername: admin
# adminPassword:
## Pgpool configuration
## Specify content for pgpool.conf
## Alternatively, you can put your pgpool.conf under the files/ directory
## ref: https://github.com/bitnami/bitnami-docker-pgpool#configuration-file
##
# configuration:
## ConfigMap with Pgpool configuration
## NOTE: This will override pgpool.configuration parameter
##
# configurationCM:
## LDAP parameters
##
ldap:
bitnami/postgresql-ha/values.yaml
+12
View File
@@ -364,6 +364,18 @@ pgpool:
adminUsername: admin
# adminPassword:
## Pgpool configuration
## Specify content for pgpool.conf
## Alternatively, you can put your pgpool.conf under the files/ directory
## ref: https://github.com/bitnami/bitnami-docker-pgpool#configuration-file
##
# configuration:
## ConfigMap with Pgpool configuration
## NOTE: This will override pgpool.configuration parameter
##
# configurationCM:
## LDAP parameters
##
ldap:
upstreamed/phpmyadmin/Chart.yaml
+2 -2
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: phpmyadmin
version: 4.2.6
appVersion: 4.9.4
version: 4.2.7
appVersion: 5.0.1
description: phpMyAdmin is an mysql administration frontend
keywords:
- mariadb
upstreamed/phpmyadmin/values.yaml
+2 -2
View File
@@ -13,7 +13,7 @@
image:
registry: docker.io
repository: bitnami/phpmyadmin
tag: 4.9.4-debian-9-r0
tag: 5.0.1-debian-9-r0
## Specify a imagePullPolicy
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
@@ -159,7 +159,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/apache-exporter
tag: 0.7.0-debian-9-r157
tag: 0.7.0-debian-9-r161
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.