Merge pull request #379 from werf/refactor/get-rid-of-static-client-where-not-needed

refactor: get rid of static client where not needed

Author: ilya-lesikov

pkg/tracker/generic/resource_events_watcher.go

@@ -14,7 +14,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 
 	"github.com/werf/kubedog/pkg/informer"
@@ -31,22 +30,19 @@ type ResourceEventsWatcher struct {
 	resourceInitialEventsUIDsMux  sync.Mutex
 	resourceInitialEventsUIDsList []types.UID
 
-	client          kubernetes.Interface
 	mapper          meta.RESTMapper
 	informerFactory *util.Concurrent[*informer.InformerFactory]
 }
 
 func NewResourceEventsWatcher(
 	object *unstructured.Unstructured,
 	resID *resid.ResourceID,
-	client kubernetes.Interface,
 	mapper meta.RESTMapper,
 	informerFactory *util.Concurrent[*informer.InformerFactory],
 ) *ResourceEventsWatcher {
 	return &ResourceEventsWatcher{
 		ResourceID:      resID,
 		object:          object,
-		client:          client,
 		mapper:          mapper,
 		informerFactory: informerFactory,
 	}

pkg/tracker/generic/resource_state_watcher.go

@@ -7,7 +7,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/dynamic"
-	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 
 	"github.com/werf/kubedog/pkg/informer"
@@ -18,22 +17,19 @@ import (
 type ResourceStateWatcher struct {
 	ResourceID *resid.ResourceID
 
-	client          kubernetes.Interface
 	dynamicClient   dynamic.Interface
 	mapper          meta.RESTMapper
 	informerFactory *util.Concurrent[*informer.InformerFactory]
 }
 
 func NewResourceStateWatcher(
 	resID *resid.ResourceID,
-	client kubernetes.Interface,
 	dynClient dynamic.Interface,
 	mapper meta.RESTMapper,
 	informerFactory *util.Concurrent[*informer.InformerFactory],
 ) *ResourceStateWatcher {
 	return &ResourceStateWatcher{
 		ResourceID:      resID,
-		client:          client,
 		dynamicClient:   dynClient,
 		mapper:          mapper,
 		informerFactory: informerFactory,

pkg/tracker/generic/tracker.go

@@ -12,7 +12,6 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
-	"k8s.io/client-go/kubernetes"
 
 	"github.com/werf/kubedog/pkg/informer"
 	"github.com/werf/kubedog/pkg/tracker/debug"
@@ -46,7 +45,6 @@ type Tracker struct {
 	lastObjDuringStatusStabilization    *unstructured.Unstructured
 	lastObjDuringStatusStabilizationMux sync.Mutex
 
-	client          kubernetes.Interface
 	dynamicClient   dynamic.Interface
 	discoveryClient discovery.CachedDiscoveryInterface
 	mapper          meta.RESTMapper
@@ -55,7 +53,6 @@ type Tracker struct {
 
 func NewTracker(
 	resID *resid.ResourceID,
-	client kubernetes.Interface,
 	dynClient dynamic.Interface,
 	discClient discovery.CachedDiscoveryInterface,
 	informerFactory *util.Concurrent[*informer.InformerFactory],
@@ -64,7 +61,6 @@ func NewTracker(
 	return &Tracker{
 		ResourceID:      resID,
 		lastState:       TrackerStateInitial,
-		client:          client,
 		dynamicClient:   dynClient,
 		discoveryClient: discClient,
 		mapper:          mapper,
@@ -77,7 +73,7 @@ func (t *Tracker) Track(ctx context.Context, noActivityTimeout time.Duration, ad
 	resModifiedCh := make(chan *unstructured.Unstructured)
 	resDeletedCh := make(chan *unstructured.Unstructured)
 
-	resourceStateWatcher := NewResourceStateWatcher(t.ResourceID, t.client, t.dynamicClient, t.mapper, t.informerFactory)
+	resourceStateWatcher := NewResourceStateWatcher(t.ResourceID, t.dynamicClient, t.mapper, t.informerFactory)
 	resourceInformerCleanupFn, err := resourceStateWatcher.Run(ctx, resAddedCh, resModifiedCh, resDeletedCh)
 	if err != nil {
 		return fmt.Errorf("run resource state watcher: %w", err)
@@ -156,7 +152,7 @@ func (t *Tracker) handleResourceAddedModified(ctx context.Context, object *unstr
 	if t.getLastState() == TrackerStateInitial {
 		eventsInformerCleanupFn := func() {}
 		if os.Getenv("KUBEDOG_DISABLE_EVENTS") != "1" {
-			resourceEventsWatcher := NewResourceEventsWatcher(object, t.ResourceID, t.client, t.mapper, t.informerFactory)
+			resourceEventsWatcher := NewResourceEventsWatcher(object, t.ResourceID, t.mapper, t.informerFactory)
 			eventsInformerCleanupFn, err = resourceEventsWatcher.Run(ctx, eventCh)
 			if err != nil {
 				return nil, fmt.Errorf("run resource events watcher: %w", err)

pkg/trackers/dyntracker/dynamic_readiness_tracker.go

@@ -156,7 +156,7 @@ func NewDynamicReadinessTracker(
 			Namespace: resourceNamespace,
 		})
 
-		tracker = generic.NewTracker(resid, staticClient, dynamicClient, discoveryClient, informerFactory, mapper)
+		tracker = generic.NewTracker(resid, dynamicClient, discoveryClient, informerFactory, mapper)
 	}
 
 	return &DynamicReadinessTracker{

pkg/trackers/rollout/multitrack/generic/resource.go

@@ -26,7 +26,7 @@ func NewResource(
 	discClient discovery.CachedDiscoveryInterface,
 	mapper meta.RESTMapper,
 ) *Resource {
-	tracker := generic.NewTracker(spec.ResourceID, client, dynClient, discClient, nil, mapper)
+	tracker := generic.NewTracker(spec.ResourceID, dynClient, discClient, nil, mapper)
 
 	return &Resource{
 		Spec:    spec,

pkg/trackers/rollout/multitrack/multitrack.go

@@ -37,7 +37,8 @@ type FailMode string
 const (
 	IgnoreAndContinueDeployProcess    FailMode = "IgnoreAndContinueDeployProcess"
 	FailWholeDeployProcessImmediately FailMode = "FailWholeDeployProcessImmediately"
-	HopeUntilEndOfDeployProcess       FailMode = "HopeUntilEndOfDeployProcess"
+	// TODO(v2): get rid. Is an equivalent to FailWholeDeployProcessImmediately at the moment.
+	LegacyHopeUntilEndOfDeployProcess FailMode = "HopeUntilEndOfDeployProcess"
 )
 
 // type DeployCondition string
@@ -691,7 +692,7 @@ func (mt *multitracker) handleResourceFailure(resourcesStates map[string]*multit
 
 		return ErrFailWholeDeployProcessImmediately
 
-	case HopeUntilEndOfDeployProcess:
+	case LegacyHopeUntilEndOfDeployProcess:
 
 	handleResourceState:
 		switch resourcesStates[spec.ResourceName].Status {

pkg/trackers/rollout/multitrack/multitrack_display.go

@@ -784,7 +784,7 @@ func formatResourceCaption(resourceCaption string, resourceFailMode FailMode, is
 			return resourceCaption
 		}
 
-	case HopeUntilEndOfDeployProcess:
+	case LegacyHopeUntilEndOfDeployProcess:
 		if isReady {
 			return utils.GreenF("%s", resourceCaption)
 		} else {