Merge pull request #31 from segmentio/yolken-ignore-diff-warnings

Strip out kubectl warnings

Author: yolken-segment

pkg/cluster/kube_client.go

@@ -1,6 +1,7 @@
 package cluster
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -238,6 +239,13 @@ func (cc *KubeClusterClient) DiffStructured(
 		)
 	}
 
+	// Strip everything before the initial "{"; kubectl can insert arbitrary warnings, etc.
+	// that can cause the result to not be valid JSON.
+	jsonStart := bytes.Index(rawResults, []byte("{"))
+	if jsonStart > 0 {
+		rawResults = rawResults[jsonStart:]
+	}
+
 	results := diff.Results{}
 	if err := json.Unmarshal(rawResults, &results); err != nil {
 		return nil, err

pkg/version/version.go

@@ -1,4 +1,4 @@
 package version
 
 // Version stores the current kubeapply version.
-const Version = "0.0.26"
+const Version = "0.0.27"