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

Merge branch 'master' into update_bitnami_dependencies

Browse Source
This commit is contained in:
Tomas Pizarro
2019-07-25 15:14:00 +02:00
committed by GitHub
parent ff54f7f999 5b1668bd1b
commit 95aabb3807
11 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bitnami/magento/templates/NOTES.txt
View File

@@ -32,13 +32,13 @@ host. To configure Magento with the URL of your service:
{{- if .Values.mariadb.enabled }}
helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \
helm upgrade {{ .Release.Name }} bitnami/{{ .Chart.Name }} \
--set magentoHost=$APP_HOST,magentoPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$DATABASE_ROOT_PASSWORD{{ end }},mariadb.db.password=$APP_DATABASE_PASSWORD{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }}
{{- else }}
## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ##
helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \
helm upgrade {{ .Release.Name }} bitnami/{{ .Chart.Name }} \
--set magentoPassword=$APP_PASSWORD,magentoHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.host) }},externalDatabase.host={{ .Values.externalDatabase.host }}{{- end }}{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }}{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }}
{{- end }}
@@ -93,7 +93,7 @@ host. To configure Magento to use and external database host:
## PLEASE UPDATE THE EXTERNAL DATABASE CONNECTION PARAMETERS IN THE FOLLOWING COMMAND AS NEEDED ##
helm upgrade {{ .Release.Name }} stable/{{ .Chart.Name }} \
helm upgrade {{ .Release.Name }} bitnami/{{ .Chart.Name }} \
--set magentoPassword=$APP_PASSWORD,magentoHost=$APP_HOST,service.type={{ .Values.service.type }},mariadb.enabled=false{{- if not (empty .Values.externalDatabase.user) }},externalDatabase.user={{ .Values.externalDatabase.user }}{{- end }}{{- if not (empty .Values.externalDatabase.password) }},externalDatabase.password={{ .Values.externalDatabase.password }}{{- end }}{{- if not (empty .Values.externalDatabase.database) }},externalDatabase.database={{ .Values.externalDatabase.database }}{{- end }},externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST{{- if .Values.global }}{{- if .Values.global.imagePullSecrets }},global.imagePullSecrets={{ .Values.global.imagePullSecrets }}{{- end }}{{- end }}
{{- end }}

7
bitnami/magento/templates/_helpers.tpl
View File

@@ -6,6 +6,13 @@ Expand the name of the chart.
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "magento.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

2
bitnami/magento/templates/apache-pvc.yaml
View File

@@ -5,7 +5,7 @@ metadata:
name: {{ template "magento.fullname" . }}-apache
labels:
app: {{ template "magento.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ template "magento.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:

4
bitnami/magento/templates/deployment.yaml
View File

@@ -5,7 +5,7 @@ metadata:
name: {{ template "magento.fullname" . }}
labels:
app: {{ template "magento.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ template "magento.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
@@ -17,7 +17,7 @@ spec:
metadata:
labels:
app: {{ template "magento.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ template "magento.chart" . }}
release: "{{ .Release.Name }}"
{{- if or .Values.podAnnotations .Values.metrics.enabled }}
annotations:

2
bitnami/magento/templates/externaldb-secrets.yaml
View File

@@ -5,7 +5,7 @@ metadata:
name: {{ template "magento.fullname" . }}-externaldb
labels:
app: {{ template "magento.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ template "magento.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
type: Opaque

2
bitnami/magento/templates/magento-pvc.yaml
View File

@@ -5,7 +5,7 @@ metadata:
name: {{ template "magento.fullname" . }}-magento
labels:
app: {{ template "magento.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ template "magento.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:

2
bitnami/magento/templates/secrets.yaml
View File

@@ -4,7 +4,7 @@ metadata:
name: {{ template "magento.fullname" . }}
labels:
app: {{ template "magento.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ template "magento.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
type: Opaque

2
bitnami/magento/templates/svc.yaml
View File

@@ -4,7 +4,7 @@ metadata:
name: {{ template "magento.fullname" . }}
labels:
app: {{ template "magento.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ template "magento.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:

2
upstreamed/mariadb/Chart.yaml
View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: mariadb
version: 6.7.1
version: 6.7.2
appVersion: 10.3.16
description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster.
keywords:

2
upstreamed/mariadb/values-production.yaml
View File

@@ -18,7 +18,7 @@
image:
registry: docker.io
repository: bitnami/mariadb
tag: 10.3.16-debian-9-r29
tag: 10.3.16-debian-9-r38
## 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

2
upstreamed/mariadb/values.yaml
View File

@@ -18,7 +18,7 @@
image:
registry: docker.io
repository: bitnami/mariadb
tag: 10.3.16-debian-9-r29
tag: 10.3.16-debian-9-r38
## 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