Merge branch 'develop'

cetic · Jul 28, 2020 · 9766cc5 · 9766cc5
2 parents bd469f3 + ea0d440
commit 9766cc5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 109 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,5 +10,5 @@ jobs:
           environment:
             - GITHUB_PAGES_REPO: cetic/helm-charts
             - HELM_CHART: adminer
-            - HELM_VERSION: 3.1.0
-          command: wget -O - https://raw.githubusercontent.com/cetic/helm-adminer/develop/publish.sh | sh
+            - HELM_VERSION: 3.1.2
+          command: wget -O - https://gist.githubusercontent.com/alexnuttinck/2e9b8595e9a94ba3b3d00eea690e37ac/raw/9989a66c1de2eb4a8bce7c44ec5fbe1f43459762/publish.sh | sh
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,8 +1,8 @@
 ---
-apiVersion: "v2"
+apiVersion: v2
 name: adminer
-appVersion: "4.7.6"
-version: 0.1.3
+appVersion: 4.7.6
+version: 0.1.4
 description: Adminer is a full-featured database management tool written in PHP. Conversely to phpMyAdmin, it consist of a single file ready to deploy to the target server. Adminer is available for MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, Firebird, SimpleDB, Elasticsearch and MongoDB
 home: https://www.adminer.org
 icon: https://raw.githubusercontent.com/Kong/docker-official-docs/master/adminer/logo.png

diff --git a/README.md b/README.md
@@ -86,9 +86,9 @@ The following table lists the configurable parameters of the Adminer chart and t
 | **Affinity**                                                                                                                              |
 | `affinity`                        | node/pod affinities                                                     | `{}`                        |
 | **LivenessProbe**                                                                                                                         |
-| `livenessProbe`                   | Liveness probe settings                                                 | `{}`                        |
+| `livenessProbe`                   | Liveness probe settings                                                 | `nil`                        |
 | **ReadnessProbe**                                                                                                                         |
-| `readinessProbe`                  | Readiness probe settings                                                | `{}`                        |
+| `readinessProbe`                  | Readiness probe settings                                                | `nil`                        |
 
 ## Credits
 

diff --git a/publish.sh b/publish.sh
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -34,16 +34,12 @@ spec:
             value: {{ .Values.config.design }}
           - name: ADMINER_DEFAULT_SERVER
             value: {{ .Values.config.externalserver }}
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          livenessProbe:
+{{ toYaml .Values.livenessProbe | indent 12 }}
+          readinessProbe:
+{{ toYaml .Values.readinessProbe | indent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}