Add PodControlInterface and PodControllerRefManager (#73)

* Add PodControlInterface and FakePodControl * Add comments for service event reasons * Skip deleting pods/services already in termination Kubernetes pkg/controller/controller_utils.go doesn’t have this logic. This is from kubeflow/training-operator/pull/998. I think it’s safe to keep the logic here. * Remove Kubernetes controller dependency Use `KeyFunc` instead of k8s.io/kubernetes/pkg/controller.KeyFunc * Add Base and PodControllerRefManager Current implementation use PodControllerRefManager from `k8s.io/kubernetes/pkg/controller` and self-implemented `ServiceControllerRefManager` which brings some problems. 1. Pod impl may change along with k8s upgrade, service impl doesn’t 2. It’s not helping us remove Kubernetes direct dependency. 3. It’s not that straighforward for maintainers and contributors. This change make sure we folk everything we need and remove ref_manager dependency. * Rename service_ref_manager to controller_ref_manager Since this file contains both BaseControllerRefManager, PodControllerRefManager and ServiceControllerRefManager. It makes sense to rename it to controller_ref_manager.go * Address code review feedbacks
kubeflow · Apr 20, 2020 · 5f6f32b · 5f6f32b
1 parent 2780782
commit 5f6f32b
Show file tree

Hide file tree

Showing 7 changed files with 697 additions and 172 deletions.
diff --git a/pkg/controller.v1/common/pod.go b/pkg/controller.v1/common/pod.go
@@ -30,7 +30,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/tools/cache"
-	"k8s.io/kubernetes/pkg/controller"
 
 	apiv1 "github.com/kubeflow/common/pkg/apis/common/v1"
 	commonutil "github.com/kubeflow/common/pkg/util"
@@ -73,7 +72,7 @@ func (jc *JobController) AddPod(obj interface{}) {
 			return
 		}
 
-		jobKey, err := controller.KeyFunc(job)
+		jobKey, err := KeyFunc(job)
 		if err != nil {
 			logger.Infof("Failed to get the jobkey: %v", err)
 			return
@@ -116,7 +115,7 @@ func (jc *JobController) UpdatePod(old, cur interface{}) {
 		// The ControllerRef was changed. Sync the old controller, if any.
 		if job := jc.resolveControllerRef(oldPod.Namespace, oldControllerRef); job != nil {
 			logger.Infof("pod ControllerRef updated: %v, %v", curPod, oldPod)
-			jobKey, err := controller.KeyFunc(job)
+			jobKey, err := KeyFunc(job)
 			if err != nil {
 				return
 			}
@@ -132,7 +131,7 @@ func (jc *JobController) UpdatePod(old, cur interface{}) {
 			return
 		}
 		logger.Debugf("pod has a ControllerRef: %v, %v", curPod, oldPod)
-		jobKey, err := controller.KeyFunc(job)
+		jobKey, err := KeyFunc(job)
 		if err != nil {
 			return
 		}
@@ -175,7 +174,7 @@ func (jc *JobController) DeletePod(obj interface{}) {
 	if job == nil {
 		return
 	}
-	jobKey, err := controller.KeyFunc(job)
+	jobKey, err := KeyFunc(job)
 	if err != nil {
 		return
 	}

diff --git a/pkg/controller.v1/common/service.go b/pkg/controller.v1/common/service.go
@@ -31,7 +31,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/kubernetes/pkg/controller"
 )
 
 var (
@@ -62,7 +61,7 @@ func (jc *JobController) AddService(obj interface{}) {
 			return
 		}
 
-		jobKey, err := controller.KeyFunc(job)
+		jobKey, err := KeyFunc(job)
 		if err != nil {
 			return
 		}