зеркало из https://github.com/Azure/helm-charts.git
apply recent bug fixes from upstream kubernetes/charts (#111)
This commit is contained in:
Родитель
88f8ff31ee
Коммит
a5bcbdb236
|
@ -1,6 +1,6 @@
|
|||
name: wordpress
|
||||
version: 0.8.0
|
||||
appVersion: 4.9.2
|
||||
version: 0.8.1
|
||||
appVersion: 4.9.4
|
||||
description: Web publishing platform for building blogs and websites.
|
||||
icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
|
||||
keywords:
|
||||
|
|
Двоичный файл не отображается.
|
@ -4,7 +4,9 @@
|
|||
|
||||
You should be able to access your new WordPress installation through
|
||||
|
||||
http://{{- .Values.ingress.hostname }}/admin
|
||||
{{- range .Values.ingress.hosts }}
|
||||
{{ if .tls }}https{{ else }}http{{ end }}://{{ .name }}/admin
|
||||
{{- end }}
|
||||
|
||||
{{- else if contains "LoadBalancer" .Values.serviceType }}
|
||||
|
||||
|
|
|
@ -21,10 +21,10 @@ spec:
|
|||
- host: {{ .name }}
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
- path: {{ default "/" .path }}
|
||||
backend:
|
||||
serviceName: {{ template "fullname" $ }}
|
||||
servicePort: {{ if .tls }}443{{ else }}80{{end}}
|
||||
servicePort: 80
|
||||
{{- if .tls }}
|
||||
tls:
|
||||
- hosts:
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
{{- if .Values.mariadb.enabled }}
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: "{{ .Release.Name }}-credentials-test"
|
||||
annotations:
|
||||
"helm.sh/hook": test-success
|
||||
spec:
|
||||
containers:
|
||||
- name: {{ .Release.Name }}-credentials-test
|
||||
image: {{ .Values.image }}
|
||||
env:
|
||||
- name: MARIADB_HOST
|
||||
value: {{ template "mariadb.fullname" . }}
|
||||
- name: MARIADB_PORT
|
||||
value: "3306"
|
||||
- name: WORDPRESS_DATABASE_NAME
|
||||
value: {{ default "" .Values.mariadb.mariadbDatabase | quote }}
|
||||
- name: WORDPRESS_DATABASE_USER
|
||||
value: {{ default "" .Values.mariadb.mariadbUser | quote }}
|
||||
- name: WORDPRESS_DATABASE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "mariadb.fullname" . }}
|
||||
key: mariadb-password
|
||||
command: ["sh", "-c", "mysql --host=$MARIADB_HOST --port=$MARIADB_PORT --user=$WORDPRESS_DATABASE_USER --password=$WORDPRESS_DATABASE_PASSWORD"]
|
||||
restartPolicy: Never
|
||||
{{- end }}
|
|
@ -1,7 +1,7 @@
|
|||
## Bitnami WordPress image version
|
||||
## ref: https://hub.docker.com/r/bitnami/wordpress/tags/
|
||||
##
|
||||
image: bitnami/wordpress:4.9.2-r0
|
||||
image: bitnami/wordpress:4.9.4-r0
|
||||
|
||||
## Specify a imagePullPolicy
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
|
|
Загрузка…
Ссылка в новой задаче