1. origin
  2. Commit b3980c05ef4e74cea6973dd5a7ec00beb721a54b
Browse code

Bug 1315595: Use in-container env vars for liveness/readiness probes

Michal Fojtik authored on 2016/03/09 02:14:29
Showing 6 changed files
examples/db-templates/mongodb-ephemeral-template.json
History View file @ b3980c0
... ... 
@@ -96,7 +96,7 @@
96 96 
                   "timeoutSeconds": 1,
97 97 
                   "initialDelaySeconds": 3,
98 98 
                   "exec": {
99 
-                    "command": [ "/bin/sh", "-i", "-c", "mongostat --host 127.0.0.1 -u admin -p ${MONGODB_ADMIN_PASSWORD} -n 1 --noheaders"]
99 
+                    "command": [ "/bin/sh", "-i", "-c", "mongostat --host 127.0.0.1 -u admin -p $MONGODB_ADMIN_PASSWORD -n 1 --noheaders"]
100 100 
                   }
101 101 
                 },
102 102 
                 "livenessProbe": {
examples/db-templates/mongodb-persistent-template.json
History View file @ b3980c0
... ... 
@@ -113,7 +113,7 @@
113 113 
                   "timeoutSeconds": 1,
114 114 
                   "initialDelaySeconds": 3,
115 115 
                   "exec": {
116 
-                    "command": [ "/bin/sh", "-i", "-c", "mongostat --host 127.0.0.1 -u admin -p ${MONGODB_ADMIN_PASSWORD} -n 1 --noheaders"]
116 
+                    "command": [ "/bin/sh", "-i", "-c", "mongostat --host 127.0.0.1 -u admin -p $MONGODB_ADMIN_PASSWORD -n 1 --noheaders"]
117 117 
                   }
118 118 
                 },
119 119 
                 "livenessProbe": {
examples/db-templates/mysql-ephemeral-template.json
History View file @ b3980c0
... ... 
@@ -97,7 +97,7 @@
97 97 
                   "initialDelaySeconds": 5,
98 98 
                   "exec": {
99 99 
                     "command": [ "/bin/sh", "-i", "-c",
100 
-                      "MYSQL_PWD='${MYSQL_PASSWORD}' mysql -h 127.0.0.1 -u ${MYSQL_USER} -D ${MYSQL_DATABASE} -e 'SELECT 1'"]
100 
+                      "MYSQL_PWD='$MYSQL_PASSWORD' mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'"]
101 101 
                   }
102 102 
                 },
103 103 
                 "livenessProbe": {
examples/db-templates/mysql-persistent-template.json
History View file @ b3980c0
... ... 
@@ -114,7 +114,7 @@
114 114 
                   "initialDelaySeconds": 5,
115 115 
                   "exec": {
116 116 
                     "command": [ "/bin/sh", "-i", "-c",
117 
-                      "MYSQL_PWD='${MYSQL_PASSWORD}' mysql -h 127.0.0.1 -u ${MYSQL_USER} -D ${MYSQL_DATABASE} -e 'SELECT 1'"]
117 
+                      "MYSQL_PWD='$MYSQL_PASSWORD' mysql -h 127.0.0.1 -u $MYSQL_USER -D $MYSQL_DATABASE -e 'SELECT 1'"]
118 118 
                   }
119 119 
                 },
120 120 
                 "livenessProbe": {
examples/db-templates/postgresql-ephemeral-template.json
History View file @ b3980c0
... ... 
@@ -96,7 +96,7 @@
96 96 
                   "timeoutSeconds": 1,
97 97 
                   "initialDelaySeconds": 5,
98 98 
                   "exec": {
99 
-                    "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'"]
99 
+                    "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'"]
100 100 
                   }
101 101 
                 },
102 102 
                 "livenessProbe": {
examples/db-templates/postgresql-persistent-template.json
History View file @ b3980c0
... ... 
@@ -113,7 +113,7 @@
113 113 
                   "timeoutSeconds": 1,
114 114 
                   "initialDelaySeconds": 5,
115 115 
                   "exec": {
116 
-                    "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U ${POSTGRESQL_USER} -q -d ${POSTGRESQL_DATABASE} -c 'SELECT 1'"]
116 
+                    "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'"]
117 117 
                   }
118 118 
                 },
119 119 
                 "livenessProbe": {
... ... 
@@ -138,10 +138,10 @@
138 138 
                   }
139 139 
                 ],
140 140 
                 "resources": {
141 
-		    "limits": {
142 
-			"memory": "${MEMORY_LIMIT}"
143 
-		    }
144 
-		},
141 
+                  "limits": {
142 
+                    "memory": "${MEMORY_LIMIT}"
143 
+                  }
144 
+                },
145 145 
                 "volumeMounts": [
146 146 
                   {
147 147 
                     "name": "${DATABASE_SERVICE_NAME}-data",