From c7a56aedeb5e5fdde0228e53506ae536358c5cce Mon Sep 17 00:00:00 2001
From: Matt Butcher <technosophos@gmail.com>
Date: Thu, 27 Oct 2016 16:20:55 -0600
Subject: [PATCH] fix(tiller): allow 3rd party APIs

This feature has been disabled in the past because simply enabling the
feature causes the Kubernetes library to make requests to a server.
Thus, running any tests that use the 'pkg/kube' library has required
running a kube API server.

This patch makes it possible to selectively activate 3rdParty API
support, and then disables that support during testing.

Future versions of the Kubernetes library appear to make it easier to
configure and mock this behavior, so this is most likely a stop-gap
measure. (Famous last words.)

Closes #1472
---
 pkg/kube/client.go      | 14 ++++++++++----
 pkg/kube/client_test.go |  6 ++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkg/kube/client.go b/pkg/kube/client.go
index 9e54930ed..c8fd3661c 100644
--- a/pkg/kube/client.go
+++ b/pkg/kube/client.go
@@ -145,7 +145,7 @@ func (c *Client) Get(namespace string, reader io.Reader) (string, error) {
 //
 // Namespace will set the namespaces
 func (c *Client) Update(namespace string, currentReader, targetReader io.Reader) error {
-	current := c.NewBuilder(includeThirdPartyAPIs).
+	current := c.NewBuilder(IncludeThirdPartyAPIs).
 		ContinueOnError().
 		NamespaceParam(namespace).
 		DefaultNamespace().
@@ -153,7 +153,7 @@ func (c *Client) Update(namespace string, currentReader, targetReader io.Reader)
 		Flatten().
 		Do()
 
-	target := c.NewBuilder(includeThirdPartyAPIs).
+	target := c.NewBuilder(IncludeThirdPartyAPIs).
 		ContinueOnError().
 		NamespaceParam(namespace).
 		DefaultNamespace().
@@ -275,10 +275,16 @@ func (c *Client) WatchUntilReady(namespace string, reader io.Reader) error {
 	return perform(c, namespace, reader, watchUntilReady)
 }
 
-const includeThirdPartyAPIs = false
+// IncludeThirdPartyAPIs indicates whether to load "dynamic" APIs.
+//
+// This requires additional calls to the Kubernetes API server, and these calls
+// are not supported by all versions. Additionally, during testing, initializing
+// a client will still attempt to contact a live server. In these situations,
+// this flag may need to be disabled.
+var IncludeThirdPartyAPIs = true
 
 func perform(c *Client, namespace string, reader io.Reader, fn ResourceActorFunc) error {
-	r := c.NewBuilder(includeThirdPartyAPIs).
+	r := c.NewBuilder(IncludeThirdPartyAPIs).
 		ContinueOnError().
 		NamespaceParam(namespace).
 		DefaultNamespace().
diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go
index 168488d82..9c986d248 100644
--- a/pkg/kube/client_test.go
+++ b/pkg/kube/client_test.go
@@ -33,6 +33,12 @@ import (
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
+func init() {
+	// Disable 3rd party APIs because this requires a live Kube API server
+	// upon initialization.
+	IncludeThirdPartyAPIs = false
+}
+
 func TestUpdateResource(t *testing.T) {
 
 	tests := []struct {