wait for the kubectl proxy

moyavuz · Dec 5, 2016 · e053887 · e053887
1 parent e309085
commit e053887
Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/build-container b/build-container
@@ -1,7 +1,7 @@
 #!/bin/bash
 ./build
-docker build -t gcr.io/hightowerlabs/konfd:v0.0.3 .
-gcloud docker -- push gcr.io/hightowerlabs/konfd:v0.0.3
+docker build -t gcr.io/hightowerlabs/konfd:v0.0.4 .
+gcloud docker -- push gcr.io/hightowerlabs/konfd:v0.0.4
 gsutil defacl ch -u AllUsers:R gs://artifacts.hightowerlabs.appspot.com
 gsutil acl ch -r -u AllUsers:R gs://artifacts.hightowerlabs.appspot.com
 rm konfd
diff --git a/cleanup b/cleanup
@@ -1,4 +1,4 @@
 #!/bin/bash
 kubectl delete secrets vault vault-secrets
-kubectl delete configmaps vault-configs vault-template
+kubectl delete configmaps vault-configs vault-template vault-template-example
 kubectl delete rs konfd
diff --git a/docs/templates.md b/docs/templates.md
@@ -175,6 +175,10 @@ type: Opaque
 
 > Notice the server.hcl has been added to the existing vault secret.
 
+It can take up to 60 seconds before the template is processed.
+
+> Use the `-sync-interval` flag to adjust the template sync interval.
+
 
 #### Decoding Secrets
 

diff --git a/kubernetes.go b/kubernetes.go
@@ -20,7 +20,9 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
+	"time"
 )
 
 var ErrNotExist = errors.New("object does not exist")
@@ -287,3 +289,16 @@ func getNamespaces() (*NamespaceList, error) {
 	}
 	return &nl, nil
 }
+
+func waitForKubernetesProxy() {
+	for {
+		resp, err := http.Get("http://127.0.0.1:8001/api")
+		if err != nil {
+			log.Println(err)
+			time.Sleep(time.Second)
+			continue
+		}
+		resp.Body.Close()
+		return
+	}
+}
diff --git a/main.go b/main.go
@@ -45,6 +45,9 @@ func main() {
 	}
 
 	log.Println("Starting konfd...")
+
+	waitForKubernetesProxy()
+
 	var wg sync.WaitGroup
 	done := make(chan struct{})
 

diff --git a/replicasets/konfd.yaml b/replicasets/konfd.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: konfd
-          image: "gcr.io/hightowerlabs/konfd:v0.0.3"
+          image: "gcr.io/hightowerlabs/konfd:v0.0.4"
           resources:
             requests:
               cpu: 100m