Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-06 23:47:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1702-psql-username

Browse Source
This commit is contained in:
Alejandro Moreno
2019-12-24 15:19:50 +01:00
committed by GitHub
parent e7a82a284d 4a29635ca8
commit da160b4868
13 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/influxdb/Chart.yaml
View File

@@ -15,4 +15,4 @@ maintainers:
name: influxdb
sources:
- https://github.com/bitnami/bitnami-docker-influxdb
version: 0.3.0
version: 0.3.1

8
bitnami/influxdb/templates/influxdb/standalone-dpl.yaml
View File

@@ -80,6 +80,10 @@ spec:
env:
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" .Values.image.debug | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
- name: INFLUXDB_HTTP_AUTH_ENABLED
value: {{ .Values.authEnabled | quote }}
{{- if .Values.adminUser.name }}
@@ -163,7 +167,7 @@ spec:
if [[ -f "${INFLUXDB_ADMIN_USER_PASSWORD_FILE:-}" ]]; then
export INFLUXDB_ADMIN_USER_PASSWORD="$(< "${INFLUXDB_ADMIN_USER_PASSWORD_FILE}")"
fi
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $livenessTimeout }}s influx -host 127.0.0.1 -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $livenessTimeout }}s influx -host $POD_IP -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
initialDelaySeconds: {{ .Values.influxdb.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.influxdb.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.influxdb.livenessProbe.timeoutSeconds }}
@@ -181,7 +185,7 @@ spec:
if [[ -f "${INFLUXDB_ADMIN_USER_PASSWORD_FILE:-}" ]]; then
export INFLUXDB_ADMIN_USER_PASSWORD="$(< "${INFLUXDB_ADMIN_USER_PASSWORD_FILE}")"
fi
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $readinessTimeout }}s influx -host 127.0.0.1 -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $readinessTimeout }}s influx -host $POD_IP -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
initialDelaySeconds: {{ .Values.influxdb.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.influxdb.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.influxdb.readinessProbe.timeoutSeconds }}

8
bitnami/influxdb/templates/influxdb/statefulset.yaml
View File

@@ -81,6 +81,10 @@ spec:
env:
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" .Values.image.debug | quote }}
- name: POD_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
- name: INFLUXDB_HTTP_AUTH_ENABLED
value: {{ .Values.authEnabled | quote }}
{{- if .Values.adminUser.name }}
@@ -164,7 +168,7 @@ spec:
if [[ -f "${INFLUXDB_ADMIN_USER_PASSWORD_FILE:-}" ]]; then
export INFLUXDB_ADMIN_USER_PASSWORD="$(< "${INFLUXDB_ADMIN_USER_PASSWORD_FILE}")"
fi
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $livenessTimeout }}s influx -host 127.0.0.1 -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $livenessTimeout }}s influx -host $POD_IP -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
initialDelaySeconds: {{ .Values.influxdb.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.influxdb.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.influxdb.livenessProbe.timeoutSeconds }}
@@ -182,7 +186,7 @@ spec:
if [[ -f "${INFLUXDB_ADMIN_USER_PASSWORD_FILE:-}" ]]; then
export INFLUXDB_ADMIN_USER_PASSWORD="$(< "${INFLUXDB_ADMIN_USER_PASSWORD_FILE}")"
fi
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $readinessTimeout }}s influx -host 127.0.0.1 -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
{{ if .Values.authEnabled }}INFLUX_USERNAME="$INFLUXDB_ADMIN_USER" INFLUX_PASSWORD="$INFLUXDB_ADMIN_USER_PASSWORD"{{ end }} timeout {{ $readinessTimeout }}s influx -host $POD_IP -port {{ .Values.influxdb.containerPorts.http }} -execute "SHOW DATABASES"
initialDelaySeconds: {{ .Values.influxdb.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.influxdb.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.influxdb.readinessProbe.timeoutSeconds }}

4
bitnami/influxdb/values-production.yaml
View File

@@ -193,14 +193,14 @@ influxdb:
##
livenessProbe:
enabled: true
initialDelaySeconds: 30
initialDelaySeconds: 180
periodSeconds: 45
timeoutSeconds: 30
successThreshold: 1
failureThreshold: 6
readinessProbe:
enabled: true
initialDelaySeconds: 5
initialDelaySeconds: 60
periodSeconds: 45
timeoutSeconds: 30
successThreshold: 1

4
bitnami/influxdb/values.yaml
View File

@@ -193,14 +193,14 @@ influxdb:
##
livenessProbe:
enabled: true
initialDelaySeconds: 30
initialDelaySeconds: 180
periodSeconds: 45
timeoutSeconds: 30
successThreshold: 1
failureThreshold: 6
readinessProbe:
enabled: true
initialDelaySeconds: 5
initialDelaySeconds: 60
periodSeconds: 45
timeoutSeconds: 30
successThreshold: 1

2
bitnami/postgresql-ha/README.md
View File

@@ -89,7 +89,7 @@ The following table lists the configurable parameters of the PostgreSQL HA chart
| `postgresql.pdb.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `nil` |
| `postgresql.username` | PostgreSQL username | `postgres` |
| `postgresql.password` | PostgreSQL password | `nil` |
| `postgresql.database` | PostgreSQL database | `nil` |
| `postgresql.database` | PostgreSQL database | `postgres` |
| `postgresql.upgradeRepmgrExtension` | Upgrade repmgr extension in the database | `false` |
| `postgresql.pgHbaTrustAll` | Configures PostgreSQL HBA to trust every user | `false` |
| `postgresql.repmgrUsername` | PostgreSQL repmgr username | `repmgr` |

18
bitnami/postgresql-ha/templates/_helpers.tpl
View File

@@ -314,18 +314,19 @@ Helm 2.11 supports the assignment of a value to a variable defined in a differen
but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
Also, we can't use a single if because lazy evaluation is not an option
*/}}
{{- $postgresqlDatabase := default "postgres" .Values.postgresql.database -}}
{{- if .Values.global }}
{{- if .Values.global.postgresql }}
{{- if .Values.global.postgresql.database }}
{{- .Values.global.postgresql.database -}}
{{- default "postgres" .Values.global.postgresql.database -}}
{{- else -}}
{{- .Values.postgresql.database -}}
{{- $postgresqlDatabase -}}
{{- end -}}
{{- else -}}
{{- .Values.postgresql.database -}}
{{- $postgresqlDatabase -}}
{{- end -}}
{{- else -}}
{{- .Values.postgresql.database -}}
{{- $postgresqlDatabase -}}
{{- end -}}
{{- end -}}
@@ -734,3 +735,12 @@ postgresql-ha: Upgrade repmgr extension
--set postgresql.upgradeRepmgrExtension=true
{{- end -}}
{{- end -}}
{{/* Set PGPASSWORD as environment variable depends on configuration */}}
{{- define "postgresql-ha.pgpassword" -}}
{{- if .Values.postgresql.usePasswordFile -}}
PGPASSWORD=$(< $POSTGRES_PASSWORD_FILE)
{{- else -}}
PGPASSWORD=$POSTGRES_PASSWORD
{{- end -}}
{{- end -}}

12
bitnami/postgresql-ha/templates/postgresql/statefulset.yaml
View File

@@ -150,11 +150,7 @@ spec:
command:
- sh
- -c
{{- if not (empty (include "postgresql-ha.postgresqlDatabase" .)) }}
- exec pg_isready -U {{ include "postgresql-ha.postgresqlUsername" . | quote }} -d {{ (include "postgresql-ha.postgresqlDatabase" .) | quote }} -h 127.0.0.1
{{- else }}
- exec pg_isready -U {{ include "postgresql-ha.postgresqlUsername" . | quote }} -h 127.0.0.1
{{- end }}
- '{{ include "postgresql-ha.pgpassword" . }} psql -w -U {{ include "postgresql-ha.postgresqlUsername" . | quote }} -d {{ (include "postgresql-ha.postgresqlDatabase" .) | quote }} -h 127.0.0.1 -c "SELECT 1"'
initialDelaySeconds: {{ .Values.postgresql.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.postgresql.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.postgresql.livenessProbe.timeoutSeconds }}
@@ -167,11 +163,7 @@ spec:
command:
- sh
- -c
{{- if not (empty (include "postgresql-ha.postgresqlDatabase" .)) }}
- exec pg_isready -U {{ include "postgresql-ha.postgresqlUsername" . | quote }} -d {{ (include "postgresql-ha.postgresqlDatabase" .) | quote }} -h 127.0.0.1
{{- else }}
- exec pg_isready -U {{ include "postgresql-ha.postgresqlUsername" . | quote }} -h 127.0.0.1
{{- end }}
- '{{ include "postgresql-ha.pgpassword" . }} psql -w -U {{ include "postgresql-ha.postgresqlUsername" . | quote }} -d {{ (include "postgresql-ha.postgresqlDatabase" .) | quote }} -h 127.0.0.1 -c "SELECT 1"'
initialDelaySeconds: {{ .Values.postgresql.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.postgresql.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.postgresql.readinessProbe.timeoutSeconds }}

2
bitnami/tomcat/Chart.yaml
View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: tomcat
version: 6.1.2
version: 6.1.3
appVersion: 9.0.30
description: Chart for Apache Tomcat
keywords:

2
bitnami/tomcat/values.yaml
View File

@@ -14,7 +14,7 @@
image:
registry: docker.io
repository: bitnami/tomcat
tag: 9.0.30-debian-9-r0
tag: 9.0.30-debian-9-r9
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images

12
githooks/functions/libyamllint.sh
View File

@@ -11,7 +11,17 @@ render_and_yaml_lint() {
local -r lint_rules="{extends: default, rules: {line-length: disable, trailing-spaces: disable, truthy: enable, document-start: disable, empty-lines: {max-end: 2} }}"
# printf '\033[0;34m- Running yamllint on %s/%s (values: %s)\n\033[0m' "$display_chart_path" "$basename_template_path" "$display_values"
if ! helm template --values "$values" "$chart_path" -x "$basename_template_path" | yamllint -s -d "$lint_rules" -; then
local -r helm_version="$(helm version --template={{.Version}})"
local -r helm_three="^v3.*"
local rendered_template
if [[ "$helm_version" =~ $helm_three ]]; then
rendered_template=$(helm template --values "$values" "$chart_path" -s "$basename_template_path" 2> /dev/null)
else
rendered_template=$(helm template --values "$values" "$chart_path" -x "$basename_template_path" 2> /dev/null)
fi
if ! echo "$rendered_template" | yamllint -s -d "$lint_rules" -; then
printf '\033[0;31m\U0001F6AB (helm template --values %s %s -x %s | yamllint -s -d "%s" -) failed\n\033[0m' "$display_values" "$display_chart_path" "$basename_template_path" "$lint_rules"
false
else

2
upstreamed/odoo/Chart.yaml
View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: odoo
version: 12.0.4
version: 12.0.5
appVersion: 12.0.20191215
description: A suite of web based open source business apps.
home: https://www.odoo.com/

2
upstreamed/odoo/values.yaml
View File

@@ -14,7 +14,7 @@
image:
registry: docker.io
repository: bitnami/odoo
tag: 12.0.20191215-debian-9-r0
tag: 12.0.20191215-debian-9-r9
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images