Merge pull request #33780 from a-robinson/cockroach

Automatic merge from submit-queue Don't tolerate unready endpoints in cockroachdb example That annotation was only included in the initial config due to cargo-culting, and has the potential to break node startup if it resolves its own address to gossip to. @bprashanth @tschottdorf

Merge pull request #33780 from a-robinson/cockroach
0b6040ce · Kubernetes Submit Queue · GitHub · fa88f98f · b9f0b04e · 0b6040ce
Commit 0b6040ce authored Oct 07, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

cockroachdb-petset.yaml examples/cockroachdb/cockroachdb-petset.yaml +0 -2

No files found.
--- a/examples/cockroachdb/cockroachdb-petset.yaml
+++ b/examples/cockroachdb/cockroachdb-petset.yaml
@@ -24,8 +24,6 @@ apiVersion: v1
 kind: Service
 metadata:
  annotations:
-    # Make sure DNS is resolvable during initialization.
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
    # Enable automatic monitoring of all instances when Prometheus is running in the cluster.
    prometheus.io/scrape: "true"
    prometheus.io/path: "_status/vars"