From 73b9a4c8d5a67dd84aee1ca7c39c59e2e0943380 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 26 May 2017 21:32:59 +0530 Subject: [PATCH] fix probes to properly query pod health --- incubator/apache/Chart.yaml | 2 +- incubator/apache/templates/deployment.yaml | 4 ++- incubator/jenkins/Chart.yaml | 2 +- incubator/jenkins/templates/deployment.yaml | 8 +++-- incubator/mariadb-cluster/Chart.yaml | 2 +- .../templates/master-deployment.yaml | 5 +++- .../templates/slave-deployment.yaml | 5 +++- incubator/mean/Chart.yaml | 2 +- incubator/mean/templates/deployment.yaml | 7 ++--- incubator/memcached/Chart.yaml | 2 +- incubator/memcached/templates/deployment.yaml | 4 ++- incubator/mysql/Chart.yaml | 2 +- incubator/mysql/templates/deployment.yaml | 5 +++- incubator/nginx/Chart.yaml | 2 +- incubator/nginx/templates/deployment.yaml | 4 ++- incubator/node/Chart.yaml | 2 +- incubator/node/templates/deployment.yaml | 7 ++--- incubator/parse/Chart.yaml | 2 +- .../parse/templates/dashboard-deployment.yaml | 6 ++-- .../parse/templates/server-deployment.yaml | 30 ++++++++++--------- incubator/postgresql/Chart.yaml | 2 +- .../postgresql/templates/deployment.yaml | 16 +++++----- incubator/sugarcrm/Chart.yaml | 2 +- incubator/sugarcrm/requirements.lock | 7 +++-- incubator/sugarcrm/requirements.yaml | 2 +- incubator/sugarcrm/templates/NOTES.txt | 4 +-- incubator/sugarcrm/templates/deployment.yaml | 18 +++++++---- incubator/suitecrm/Chart.yaml | 2 +- incubator/suitecrm/templates/deployment.yaml | 18 +++++++---- incubator/tomcat/Chart.yaml | 2 +- incubator/tomcat/templates/deployment.yaml | 4 ++- incubator/wildfly/Chart.yaml | 2 +- incubator/wildfly/templates/deployment.yaml | 4 ++- 33 files changed, 114 insertions(+), 72 deletions(-) diff --git a/incubator/apache/Chart.yaml b/incubator/apache/Chart.yaml index 226b3f2e8..1faaacce2 100644 --- a/incubator/apache/Chart.yaml +++ b/incubator/apache/Chart.yaml @@ -1,5 +1,5 @@ name: apache -version: 0.3.6 +version: 0.3.7 description: Chart for Apache HTTP Server keywords: - apache diff --git a/incubator/apache/templates/deployment.yaml b/incubator/apache/templates/deployment.yaml index f56e330cb..5014f7c29 100644 --- a/incubator/apache/templates/deployment.yaml +++ b/incubator/apache/templates/deployment.yaml @@ -32,12 +32,14 @@ spec: port: http initialDelaySeconds: 30 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: path: / port: http initialDelaySeconds: 5 - timeoutSeconds: 1 + timeoutSeconds: 3 + periodSeconds: 5 volumeMounts: - name: apache-data mountPath: /bitnami/apache diff --git a/incubator/jenkins/Chart.yaml b/incubator/jenkins/Chart.yaml index 402dba680..394c088a1 100644 --- a/incubator/jenkins/Chart.yaml +++ b/incubator/jenkins/Chart.yaml @@ -1,5 +1,5 @@ name: jenkins -version: 0.4.15 +version: 0.4.16 description: The leading open source automation server keywords: - jenkins diff --git a/incubator/jenkins/templates/deployment.yaml b/incubator/jenkins/templates/deployment.yaml index 5148361ef..fd38acc01 100644 --- a/incubator/jenkins/templates/deployment.yaml +++ b/incubator/jenkins/templates/deployment.yaml @@ -34,14 +34,16 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 120 + initialDelaySeconds: 180 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: path: / port: http - initialDelaySeconds: 5 - timeoutSeconds: 1 + initialDelaySeconds: 30 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/mariadb-cluster/Chart.yaml b/incubator/mariadb-cluster/Chart.yaml index 15f4ec179..2e18862bc 100644 --- a/incubator/mariadb-cluster/Chart.yaml +++ b/incubator/mariadb-cluster/Chart.yaml @@ -1,5 +1,5 @@ name: mariadb-cluster -version: 0.4.0 +version: 0.4.1 description: Chart to create a Highly available MariaDB cluster keywords: - mariadb diff --git a/incubator/mariadb-cluster/templates/master-deployment.yaml b/incubator/mariadb-cluster/templates/master-deployment.yaml index b383e1851..1c5968d22 100644 --- a/incubator/mariadb-cluster/templates/master-deployment.yaml +++ b/incubator/mariadb-cluster/templates/master-deployment.yaml @@ -54,14 +54,17 @@ spec: - -c - exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD initialDelaySeconds: 60 + periodSeconds: 5 timeoutSeconds: 5 + failureThreshold: 10 readinessProbe: exec: command: - sh - -c - exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD - initialDelaySeconds: 5 + initialDelaySeconds: 30 + periodSeconds: 5 timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/incubator/mariadb-cluster/templates/slave-deployment.yaml b/incubator/mariadb-cluster/templates/slave-deployment.yaml index 4e7748724..dd54698b9 100644 --- a/incubator/mariadb-cluster/templates/slave-deployment.yaml +++ b/incubator/mariadb-cluster/templates/slave-deployment.yaml @@ -65,14 +65,17 @@ spec: - -c - exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD initialDelaySeconds: 60 + periodSeconds: 5 timeoutSeconds: 5 + failureThreshold: 10 readinessProbe: exec: command: - sh - -c - exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD - initialDelaySeconds: 5 + initialDelaySeconds: 30 + periodSeconds: 5 timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/incubator/mean/Chart.yaml b/incubator/mean/Chart.yaml index ed46b5707..9c37b1a7c 100644 --- a/incubator/mean/Chart.yaml +++ b/incubator/mean/Chart.yaml @@ -1,5 +1,5 @@ name: mean -version: 0.1.2 +version: 0.1.3 description: MEAN is a free and open-source JavaScript software stack for building dynamic web sites and web applications. The MEAN stack is MongoDB, Express.js, Angular, and Node.js. Because all components of the MEAN stack support programs written in JavaScript, MEAN applications can be written in one language for both server-side and client-side execution environments. keywords: - node diff --git a/incubator/mean/templates/deployment.yaml b/incubator/mean/templates/deployment.yaml index 1bae1bad5..4673fbd88 100644 --- a/incubator/mean/templates/deployment.yaml +++ b/incubator/mean/templates/deployment.yaml @@ -102,16 +102,15 @@ spec: path: / port: http initialDelaySeconds: 180 - periodSeconds: 5 timeoutSeconds: 5 - failureThreshold: 10 + failureThreshold: 6 readinessProbe: httpGet: path: / port: http - initialDelaySeconds: 5 + initialDelaySeconds: 30 + timeoutSeconds: 3 periodSeconds: 5 - timeoutSeconds: 1 volumeMounts: - name: app mountPath: /app diff --git a/incubator/memcached/Chart.yaml b/incubator/memcached/Chart.yaml index 6e92d858d..b266cd1c9 100644 --- a/incubator/memcached/Chart.yaml +++ b/incubator/memcached/Chart.yaml @@ -1,5 +1,5 @@ name: memcached -version: 0.4.9 +version: 0.4.10 description: Chart for Memcached keywords: - memcached diff --git a/incubator/memcached/templates/deployment.yaml b/incubator/memcached/templates/deployment.yaml index ab273beb9..1300cb759 100644 --- a/incubator/memcached/templates/deployment.yaml +++ b/incubator/memcached/templates/deployment.yaml @@ -33,10 +33,12 @@ spec: port: memcache initialDelaySeconds: 30 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: tcpSocket: port: memcache initialDelaySeconds: 5 - timeoutSeconds: 1 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/incubator/mysql/Chart.yaml b/incubator/mysql/Chart.yaml index e05b33130..4d1d9a93b 100644 --- a/incubator/mysql/Chart.yaml +++ b/incubator/mysql/Chart.yaml @@ -1,5 +1,5 @@ name: mysql -version: 0.1.10 +version: 0.1.11 description: MySQL is a fast, reliable, scalable, and easy to use open-source relational database system. MySQL Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. keywords: - mysql diff --git a/incubator/mysql/templates/deployment.yaml b/incubator/mysql/templates/deployment.yaml index 0f5248cae..48a0486ab 100644 --- a/incubator/mysql/templates/deployment.yaml +++ b/incubator/mysql/templates/deployment.yaml @@ -65,8 +65,10 @@ spec: - sh - -c - exec mysqladmin --host $POD_IP ping - initialDelaySeconds: 30 + initialDelaySeconds: 120 + periodSeconds: 5 timeoutSeconds: 5 + failureThreshold: 10 readinessProbe: exec: command: @@ -74,6 +76,7 @@ spec: - -c - exec mysqladmin --host $POD_IP ping initialDelaySeconds: 5 + periodSeconds: 5 timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/incubator/nginx/Chart.yaml b/incubator/nginx/Chart.yaml index a64067df9..a28bf5192 100644 --- a/incubator/nginx/Chart.yaml +++ b/incubator/nginx/Chart.yaml @@ -1,5 +1,5 @@ name: nginx -version: 0.3.4 +version: 0.3.5 description: Chart for the nginx server keywords: - nginx diff --git a/incubator/nginx/templates/deployment.yaml b/incubator/nginx/templates/deployment.yaml index f59a5c001..87ef757df 100644 --- a/incubator/nginx/templates/deployment.yaml +++ b/incubator/nginx/templates/deployment.yaml @@ -32,12 +32,14 @@ spec: port: http initialDelaySeconds: 30 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: path: / port: http initialDelaySeconds: 5 - timeoutSeconds: 1 + timeoutSeconds: 3 + periodSeconds: 5 volumeMounts: - name: nginx-data mountPath: /bitnami/nginx diff --git a/incubator/node/Chart.yaml b/incubator/node/Chart.yaml index efd39362a..c5e52f1ae 100644 --- a/incubator/node/Chart.yaml +++ b/incubator/node/Chart.yaml @@ -1,5 +1,5 @@ name: node -version: 0.1.13 +version: 0.1.14 description: Event-driven I/O server-side JavaScript environment based on V8 keywords: - node diff --git a/incubator/node/templates/deployment.yaml b/incubator/node/templates/deployment.yaml index 82538bcfa..ca53821d8 100644 --- a/incubator/node/templates/deployment.yaml +++ b/incubator/node/templates/deployment.yaml @@ -78,16 +78,15 @@ spec: path: / port: http initialDelaySeconds: 180 - periodSeconds: 5 timeoutSeconds: 5 - failureThreshold: 10 + failureThreshold: 6 readinessProbe: httpGet: path: / port: http - initialDelaySeconds: 5 + initialDelaySeconds: 30 + timeoutSeconds: 3 periodSeconds: 5 - timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/parse/Chart.yaml b/incubator/parse/Chart.yaml index 6d803c81f..c31c43514 100644 --- a/incubator/parse/Chart.yaml +++ b/incubator/parse/Chart.yaml @@ -1,5 +1,5 @@ name: parse -version: 0.1.15 +version: 0.1.16 description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more. keywords: - parse diff --git a/incubator/parse/templates/dashboard-deployment.yaml b/incubator/parse/templates/dashboard-deployment.yaml index 377f50087..3b7199e3b 100644 --- a/incubator/parse/templates/dashboard-deployment.yaml +++ b/incubator/parse/templates/dashboard-deployment.yaml @@ -50,12 +50,14 @@ spec: port: dashboard-http initialDelaySeconds: 120 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: path: / port: dashboard-http - initialDelaySeconds: 5 - timeoutSeconds: 1 + initialDelaySeconds: 30 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.parseDashboard.resources | indent 10 }} volumeMounts: diff --git a/incubator/parse/templates/server-deployment.yaml b/incubator/parse/templates/server-deployment.yaml index ff655d7de..c0190f29f 100644 --- a/incubator/parse/templates/server-deployment.yaml +++ b/incubator/parse/templates/server-deployment.yaml @@ -41,23 +41,25 @@ spec: - name: server-http containerPort: {{ .Values.parse.port }} livenessProbe: - exec: - command: - - curl - - -H - - "X-Parse-Application-Id: {{ .Values.parse.appId }}" - - "http://localhost:{{ .Values.parse.port }}{{ .Values.parse.mountPath }}/users" + httpGet: + path: {{ .Values.parse.mountPath }}/users + port: server-http + httpHeaders: + - name: X-Parse-Application-Id + value: {{ .Values.parse.appId }} initialDelaySeconds: 120 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: - exec: - command: - - curl - - -H - - "X-Parse-Application-Id: {{ .Values.parse.appId }}" - - "http://localhost:{{ .Values.parse.port }}{{ .Values.parse.mountPath }}/users" - initialDelaySeconds: 5 - timeoutSeconds: 1 + httpGet: + path: {{ .Values.parse.mountPath }}/users + port: server-http + httpHeaders: + - name: X-Parse-Application-Id + value: {{ .Values.parse.appId }} + initialDelaySeconds: 30 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.parse.resources | indent 10 }} volumeMounts: diff --git a/incubator/postgresql/Chart.yaml b/incubator/postgresql/Chart.yaml index b7ec388a3..9de3b4b6a 100644 --- a/incubator/postgresql/Chart.yaml +++ b/incubator/postgresql/Chart.yaml @@ -1,5 +1,5 @@ name: postgresql -version: 0.4.8 +version: 0.4.9 description: Chart for PostgreSQL keywords: - postgresql diff --git a/incubator/postgresql/templates/deployment.yaml b/incubator/postgresql/templates/deployment.yaml index d7c2e9809..aade8f715 100644 --- a/incubator/postgresql/templates/deployment.yaml +++ b/incubator/postgresql/templates/deployment.yaml @@ -33,19 +33,21 @@ spec: livenessProbe: exec: command: - - pg_isready - - -U - - {{ default "" .Values.postgresqlUsername | quote }} + - sh + - -c + - exec pg_isready -U {{ default "" .Values.postgresqlUsername | quote }} --host $POD_IP initialDelaySeconds: 30 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: exec: command: - - pg_isready - - -U - - {{ default "" .Values.postgresqlUsername | quote }} + - sh + - -c + - exec pg_isready -U {{ default "" .Values.postgresqlUsername | quote }} --host $POD_IP initialDelaySeconds: 5 - timeoutSeconds: 1 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/sugarcrm/Chart.yaml b/incubator/sugarcrm/Chart.yaml index d15d66ae8..0cdd34568 100644 --- a/incubator/sugarcrm/Chart.yaml +++ b/incubator/sugarcrm/Chart.yaml @@ -1,5 +1,5 @@ name: sugarcrm -version: 0.1.0 +version: 0.1.1 description: SugarCRM enables businesses to create extraordinary customer relationships with the most innovative and affordable CRM solution in the market. keywords: - sugarcrm diff --git a/incubator/sugarcrm/requirements.lock b/incubator/sugarcrm/requirements.lock index 2a4d7a67b..c1231f5a6 100644 --- a/incubator/sugarcrm/requirements.lock +++ b/incubator/sugarcrm/requirements.lock @@ -1,9 +1,10 @@ dependencies: - condition: "" enabled: false + import-values: null name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ tags: null - version: 0.5.14 -digest: sha256:2fb90a9c727e6e08699232d50f00393378827639db9c62da19fd951103b112d6 -generated: 2017-04-04T12:19:51.045172688+05:30 + version: 0.6.2 +digest: sha256:66acb700f673b56045b00d0b65e3ab750f12941005e7631d69bd4101f51424ab +generated: 2017-05-26T17:14:33.222827466+05:30 diff --git a/incubator/sugarcrm/requirements.yaml b/incubator/sugarcrm/requirements.yaml index 4c7379c83..e12e21636 100644 --- a/incubator/sugarcrm/requirements.yaml +++ b/incubator/sugarcrm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.14 + version: 0.6.2 repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/incubator/sugarcrm/templates/NOTES.txt b/incubator/sugarcrm/templates/NOTES.txt index 146be804b..8ff437379 100644 --- a/incubator/sugarcrm/templates/NOTES.txt +++ b/incubator/sugarcrm/templates/NOTES.txt @@ -45,6 +45,6 @@ host. To configure SugarCRM with the URL of your service: 2. Get your SugarCRM login credentials by running: - echo Username : {{ .Values.sugarcrmUsername }} - echo Password : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.sugarcrm-password}" | base64 --decode) + echo Username: {{ .Values.sugarcrmUsername }} + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.sugarcrm-password}" | base64 --decode) {{- end }} diff --git a/incubator/sugarcrm/templates/deployment.yaml b/incubator/sugarcrm/templates/deployment.yaml index 24879c1fa..00154f137 100644 --- a/incubator/sugarcrm/templates/deployment.yaml +++ b/incubator/sugarcrm/templates/deployment.yaml @@ -61,16 +61,24 @@ spec: containerPort: 443 livenessProbe: httpGet: - path: / + path: /index.php port: http - initialDelaySeconds: 120 + httpHeaders: + - name: Host + value: {{ include "host" . | quote }} + initialDelaySeconds: 300 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: - path: / + path: /index.php port: http - initialDelaySeconds: 30 - timeoutSeconds: 1 + httpHeaders: + - name: Host + value: {{ include "host" . | quote }} + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/suitecrm/Chart.yaml b/incubator/suitecrm/Chart.yaml index 719bda532..2ef1cbb13 100644 --- a/incubator/suitecrm/Chart.yaml +++ b/incubator/suitecrm/Chart.yaml @@ -1,5 +1,5 @@ name: suitecrm -version: 0.1.0 +version: 0.1.1 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: - suitecrm diff --git a/incubator/suitecrm/templates/deployment.yaml b/incubator/suitecrm/templates/deployment.yaml index 81fc6cba1..5c2a2aeaf 100644 --- a/incubator/suitecrm/templates/deployment.yaml +++ b/incubator/suitecrm/templates/deployment.yaml @@ -61,16 +61,24 @@ spec: containerPort: 443 livenessProbe: httpGet: - path: / + path: /index.php port: http - initialDelaySeconds: 120 + httpHeaders: + - name: Host + value: {{ include "host" . | quote }} + initialDelaySeconds: 300 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: - path: / + path: /index.php port: http - initialDelaySeconds: 30 - timeoutSeconds: 1 + httpHeaders: + - name: Host + value: {{ include "host" . | quote }} + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/tomcat/Chart.yaml b/incubator/tomcat/Chart.yaml index ad793e373..e377b95e0 100644 --- a/incubator/tomcat/Chart.yaml +++ b/incubator/tomcat/Chart.yaml @@ -1,5 +1,5 @@ name: tomcat -version: 0.4.10 +version: 0.4.11 description: Chart for Apache Tomcat keywords: - tomcat diff --git a/incubator/tomcat/templates/deployment.yaml b/incubator/tomcat/templates/deployment.yaml index 9dd31adcd..45067ae02 100644 --- a/incubator/tomcat/templates/deployment.yaml +++ b/incubator/tomcat/templates/deployment.yaml @@ -34,12 +34,14 @@ spec: port: http initialDelaySeconds: 120 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: path: / port: http initialDelaySeconds: 30 - timeoutSeconds: 1 + timeoutSeconds: 3 + periodSeconds: 51 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/wildfly/Chart.yaml b/incubator/wildfly/Chart.yaml index 12ab37998..df210f0ad 100644 --- a/incubator/wildfly/Chart.yaml +++ b/incubator/wildfly/Chart.yaml @@ -1,5 +1,5 @@ name: wildfly -version: 0.4.7 +version: 0.4.8 description: Chart for Wildfly keywords: - wildfly diff --git a/incubator/wildfly/templates/deployment.yaml b/incubator/wildfly/templates/deployment.yaml index 7cdbb9be9..50892018b 100644 --- a/incubator/wildfly/templates/deployment.yaml +++ b/incubator/wildfly/templates/deployment.yaml @@ -36,12 +36,14 @@ spec: port: http initialDelaySeconds: 120 timeoutSeconds: 5 + failureThreshold: 6 readinessProbe: httpGet: path: / port: http initialDelaySeconds: 30 - timeoutSeconds: 1 + timeoutSeconds: 3 + periodSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: