Gopkg.toml: kubernetes 1.12.2

pkg/helm/release/manager*.go: fix broken API's from k8s upgrade

Author: estroz

Gopkg.toml

@@ -1,46 +1,50 @@
-[[constraint]]
-  name = "github.com/sirupsen/logrus"
-  version = "1.0.4"
-
-[[constraint]]
-  name = "github.com/spf13/cobra"
-  version = "0.0.3"
+[[override]]
+  name = "k8s.io/kubernetes"
+  version = "=1.12.2"
 
 [[override]]
   name = "k8s.io/api"
-  version = "kubernetes-1.11.2"
+  version = "kubernetes-1.12.2"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.11.2"
+  version = "kubernetes-1.12.2"
 
 [[override]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.11.2"
+  version = "kubernetes-1.12.2"
 
 [[override]]
   name = "k8s.io/apiserver"
-  version = "kubernetes-1.11.2"
+  version = "kubernetes-1.12.2"
 
 [[override]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.11.2"
+  version = "kubernetes-1.12.2"
+
+[[override]]
+  name = "k8s.io/cli-runtime"
+  version = "kubernetes-1.12.2"
 
 [[constraint]]
   name = "github.com/sergi/go-diff"
   version = "1.0.0"
 
 [[constraint]]
   name = "sigs.k8s.io/controller-runtime"
-  version = "v0.1.4"
+  revision = "a4051585e748b437e799d597f9adba1d777cb12a"
 
 [[constraint]]
   name = "k8s.io/helm"
-  version = "2.11.0"
+  version = "=2.12.0-rc.1"
 
-[[override]]
-  name = "k8s.io/kubernetes"
-  version = "=1.11.2"
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = "1.0.4"
+
+[[constraint]]
+  name = "github.com/spf13/cobra"
+  version = "0.0.3"
 
 # We need overrides for the following imports because dep can't resolve them
 # correctly. The easiest way to get this right is to use the versions that
@@ -56,4 +60,3 @@
 [[override]]
   name = "github.com/docker/docker"
   revision = "4f3616fb1c112e206b88cb7a9922bf49067a7756"
-

pkg/helm/release/manager.go

@@ -24,7 +24,9 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apitypes "k8s.io/apimachinery/pkg/types"
+	"k8s.io/cli-runtime/pkg/genericclioptions/resource"
 	"k8s.io/client-go/rest"
 	"k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/kube"
@@ -33,7 +35,6 @@ import (
 	"k8s.io/helm/pkg/proto/hapi/services"
 	"k8s.io/helm/pkg/storage"
 	"k8s.io/helm/pkg/tiller"
-	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/resource"
 
 	"github.com/operator-framework/operator-sdk/pkg/helm/internal/types"
 )
@@ -310,7 +311,7 @@ func reconcileRelease(ctx context.Context, tillerKubeClient *kube.Client, namesp
 			*r = *r.Context(ctx)
 		})
 		helper := resource.NewHelper(expectedClient, expected.Mapping)
-		_, err = helper.Create(expected.Namespace, true, expected.Object)
+		_, err = helper.Create(expected.Namespace, true, expected.Object, &metav1.CreateOptions{})
 		if err == nil {
 			return nil
 		}
@@ -323,7 +324,7 @@ func reconcileRelease(ctx context.Context, tillerKubeClient *kube.Client, namesp
 			return fmt.Errorf("failed to marshal JSON patch: %s", err)
 		}
 
-		_, err = helper.Patch(expected.Namespace, expected.Name, apitypes.MergePatchType, patch)
+		_, err = helper.Patch(expected.Namespace, expected.Name, apitypes.MergePatchType, patch, &metav1.UpdateOptions{})
 		if err != nil {
 			return fmt.Errorf("patch error: %s", err)
 		}

pkg/helm/release/manager_factory.go

@@ -24,12 +24,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	apitypes "k8s.io/apimachinery/pkg/types"
+	clientset "k8s.io/client-go/kubernetes"
 	helmengine "k8s.io/helm/pkg/engine"
 	"k8s.io/helm/pkg/kube"
 	"k8s.io/helm/pkg/storage"
 	"k8s.io/helm/pkg/tiller"
 	"k8s.io/helm/pkg/tiller/environment"
-	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 
 	"github.com/operator-framework/operator-sdk/pkg/helm/engine"
 	"github.com/operator-framework/operator-sdk/pkg/helm/internal/types"
@@ -86,9 +86,9 @@ func (f managerFactory) tillerRendererForCR(r *unstructured.Unstructured) *tille
 		KubeClient: f.tillerKubeClient,
 	}
 	kubeconfig, _ := f.tillerKubeClient.ToRESTConfig()
-	internalClientSet, _ := internalclientset.NewForConfig(kubeconfig)
+	cs := clientset.NewForConfigOrDie(kubeconfig)
 
-	return tiller.NewReleaseServer(env, internalClientSet, false)
+	return tiller.NewReleaseServer(env, cs, false)
 }
 
 func getReleaseName(r *unstructured.Unstructured) string {