diff --git a/templates/client-daemonset.yaml b/templates/client-daemonset.yaml
index 4adbac3..50cde56 100644
--- a/templates/client-daemonset.yaml
+++ b/templates/client-daemonset.yaml
@@ -99,6 +99,16 @@ spec:
               name: server
             - containerPort: 8600
               name: dns
+          readinessProbe:
+            # NOTE(mitchellh): when our HTTP status endpoints support the
+            # proper status codes, we should switch to that. This is temporary.
+            exec:
+              command:
+                - "/bin/sh"
+                - "-ec"
+                - |
+                  curl http://127.0.0.1:8500/v1/status/leader 2>/dev/null | \
+                  grep -E '".+"'
           resources:
-{{ toYaml .Values.server.resources | indent 12 }}
+{{ toYaml .Values.client.resources | indent 12 }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
index a1889ed..a31527f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -68,6 +68,11 @@ client:
   image: null
   join: null
 
+  # Resource requests, limits, etc. for the client cluster placement. This
+  # should map directly to the value of the resources field for a PodSpec.
+  # By default no direct resource request is made.
+  resources: {}
+
   # extraConfig is a raw string of extra configuration to set with the
   # server. This should be JSON or HCL.
   extraConfig: |