[stable/osclass] use httpGet method in probes (#1194)

* osclass: fix probes to properly query pod health

* osclass: fix NOTES to fetch the password

* update chart.yaml
This commit is contained in:
Sameer Naik
2017-06-08 09:20:05 -07:00
committed by Lachlan Evenson
parent ec52ae4692
commit 1ff267e072
3 changed files with 27 additions and 22 deletions
+3 -2
View File
@@ -1,5 +1,6 @@
name: osclass
version: 0.4.3
version: 0.4.4
appVersion: 3.7.3
description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site.
keywords:
- osclass
@@ -11,7 +12,7 @@ home: https://osclass.org/
sources:
- https://github.com/bitnami/bitnami-docker-osclass
maintainers:
- name: Bitnami
- name: bitnami-bot
email: containers@bitnami.com
engine: gotpl
icon: https://bitnami.com/assets/stacks/osclass/img/osclass-stack-110x117.png
+7 -5
View File
@@ -19,14 +19,16 @@ host. To configure Osclass with the URL of your service:
Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
export APP_PASSWORD=$(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.osclass-password[*]}"`))
export APP_DATABASE_PASSWORD=$(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password[*]}"`))
export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.osclass-password}" | base64 --decode)
{{- if .Values.mariadb.mariadbRootPassword }}
export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
{{- end }}
{{- end }}
2. Complete your Osclass deployment by running:
helm upgrade {{ .Release.Name }} \
--set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD,mariadb.mariadbRootPassword=$APP_DATABASE_PASSWORD stable/osclass
--set osclassHost=$APP_HOST,osclassPassword=$APP_PASSWORD{{ if .Values.mariadb.mariadbRootPassword }},mariadb.mariadbRootPassword=$APP_DATABASE_PASSWORD{{ end }} stable/osclass
{{- else -}}
1. Get the Osclass URL by running:
@@ -45,6 +47,6 @@ host. To configure Osclass with the URL of your service:
2. Get your Osclass login credentials by running:
echo Username : {{ .Values.osclassUsername }}
echo Password : $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.osclass-password[*]}"`))
echo Username : {{ .Values.osclassUsername }}
echo Password : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.osclass-password}" | base64 --decode)
{{- end }}
+17 -15
View File
@@ -64,23 +64,25 @@ spec:
- name: https
containerPort: 443
livenessProbe:
exec:
command:
- nc
- -z
- localhost
- "80"
httpGet:
path: /index.php
port: http
httpHeaders:
- name: Host
value: {{ include "host" . | quote }}
initialDelaySeconds: 120
timeoutSeconds: 5
timeoutSeconds: 120
failureThreshold: 6
readinessProbe:
exec:
command:
- nc
- -z
- localhost
- "80"
initialDelaySeconds: 5
timeoutSeconds: 1
httpGet:
path: /index.php
port: http
httpHeaders:
- name: Host
value: {{ include "host" . | quote }}
initialDelaySeconds: 30
timeoutSeconds: 120
periodSeconds: 5
resources:
{{ toYaml .Values.resources | indent 10 }}
volumeMounts: