Informer: Use unstructured

Gopkg.toml

@@ -17,18 +17,18 @@ required = [
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "~5.0.0"
+  version = "~6.0.0"
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  version = "~v1.8.9"
+  version = "~v1.9.0"
 
 [[constraint]]
-  branch = "release-1.8"
+  branch = "release-1.9"
   name = "k8s.io/api"
 
 [[constraint]]
-  branch = "release-1.8"
+  branch = "release-1.9"
   name = "k8s.io/apimachinery"
 
 [[constraint]]
@@ -43,4 +43,4 @@ required = [
 
 [[constraint]]
   name = "k8s.io/apiserver"
-  version = "~kubernetes-1.8.5"
+  version = "~kubernetes-1.9"

cmd/tf-operator.v2/app/server.go

@@ -49,6 +49,7 @@ var (
 	leaseDuration = 15 * time.Second
 	renewDuration = 5 * time.Second
 	retryPeriod   = 3 * time.Second
+	resyncPeriod  = 30 * time.Second
 )
 
 const RecommendedKubeConfigPathEnv = "KUBECONFIG"
@@ -91,15 +92,21 @@ func Run(opt *options.ServerOption) error {
 	}
 
 	// Create informer factory.
-	kubeInformerFactory := kubeinformers.NewSharedInformerFactory(kubeClientSet, time.Second*30)
-	tfJobInformerFactory := tfjobinformers.NewSharedInformerFactory(tfJobClientSet, time.Second*30)
+	kubeInformerFactory := kubeinformers.NewSharedInformerFactory(kubeClientSet, resyncPeriod)
+	tfJobInformerFactory := tfjobinformers.NewSharedInformerFactory(tfJobClientSet, resyncPeriod)
+
+	unstructuredInformer := controller.NewUnstructuredTFJobInformer(kcfg)
 
 	// Create tf controller.
-	tc := controller.NewTFJobController(kubeClientSet, tfJobClientSet, kubeInformerFactory, tfJobInformerFactory)
+	tc := controller.NewTFJobController(unstructuredInformer, kubeClientSet, tfJobClientSet, kubeInformerFactory, tfJobInformerFactory)
 
 	// Start informer goroutines.
 	go kubeInformerFactory.Start(stopCh)
-	go tfJobInformerFactory.Start(stopCh)
+
+	// We do not use the generated informer because of
+	// https://github.com/kubeflow/tf-operator/issues/561
+	// go tfJobInformerFactory.Start(stopCh)
+	go unstructuredInformer.Informer().Run(stopCh)
 
 	// Set leader election start function.
 	run := func(<-chan struct{}) {

pkg/apis/tensorflow/v1alpha2/register.go

@@ -31,10 +31,14 @@ var (
 const (
 	// GroupName is the group name use in this package.
 	GroupName = "kubeflow.org"
-	// TFJobResourceKind is the kind name.
-	TFJobResourceKind = "TFJob"
+	// Kind is the kind name.
+	Kind = "TFJob"
 	// GroupVersion is the version.
 	GroupVersion = "v1alpha2"
+	// Plural is the Plural for TFJob.
+	Plural = "tfjobs"
+	// Singular is the singular for TFJob.
+	Singular = "tfjob"
 )
 
 // SchemeGroupVersion is the group version used to register these objects.