add UserAgent = kruise-rollout (openkruise#64)

Signed-off-by: mingzhou.swx <[email protected]> Co-authored-by: mingzhou.swx <[email protected]> Signed-off-by: yike21 <[email protected]>
yike21 · Aug 29, 2022 · fa4ea01 · fa4ea01
1 parent 2f8e01b
commit fa4ea01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -72,14 +72,17 @@ func main() {
 	flag.Parse()
 	ctrl.SetLogger(klogr.New())
 
+	cfg := ctrl.GetConfigOrDie()
+	cfg.UserAgent = "kruise-rollout"
+
 	setupLog.Info("new clientset registry")
-	err := utilclient.NewRegistry(ctrl.GetConfigOrDie())
+	err := utilclient.NewRegistry(cfg)
 	if err != nil {
 		setupLog.Error(err, "unable to init clientset and informer")
 		os.Exit(1)
 	}
 
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
+	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme:                 scheme,
 		MetricsBindAddress:     metricsAddr,
 		Port:                   9443,

diff --git a/pkg/controller/batchrelease/batchrelease_special_cases_handler.go b/pkg/controller/batchrelease/batchrelease_special_cases_handler.go
@@ -191,11 +191,11 @@ func isGetWorkloadInfoError(err error) bool {
 }
 
 func isWorkloadLocated(err error, release *v1alpha1.BatchRelease) bool {
-	return err == nil && release.Status.Phase == v1alpha1.RolloutPhaseInitial
+	return err == nil && (release.Status.Phase == v1alpha1.RolloutPhaseInitial || release.Status.Phase == "")
 }
 
 func isWorkloadGone(event workloads.WorkloadEventType, release *v1alpha1.BatchRelease) bool {
-	return event == workloads.WorkloadHasGone && release.Status.Phase != v1alpha1.RolloutPhaseInitial
+	return event == workloads.WorkloadHasGone && release.Status.Phase != v1alpha1.RolloutPhaseInitial && release.Status.Phase != ""
 }
 
 func isWorkloadScaling(event workloads.WorkloadEventType, release *v1alpha1.BatchRelease) bool {