github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-02-14 18:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable metrics server port in tests and add log for rollout (#2012)

Browse Source
This commit is contained in:
Jianbo Sun
2021-08-03 14:53:38 +08:00
committed by GitHub
parent af1e9dc195
commit e3edde44af
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/common/rollout/rollout_plan_controller.go
View File

@@ -340,9 +340,14 @@ func (r *Controller) GetWorkloadController() (workloads.WorkloadController, erro
if r.targetWorkload.GetKind() == reflect.TypeOf(kruisev1.CloneSet{}).Name() {
// check whether current rollout plan is for workload rolling or scaling
if r.sourceWorkload != nil {
klog.InfoS("using cloneset rollout controller for this rolloutplan", "source workload name", source.Name, "namespace",
source.Namespace, "target workload name", target.Name, "namespace",
target.Namespace)
return workloads.NewCloneSetRolloutController(r.client, r.recorder, r.parentController,
r.rolloutSpec, r.rolloutStatus, target), nil
}
klog.InfoS("using cloneset scale controller for this rolloutplan", "target workload name", target.Name, "namespace",
target.Namespace)
return workloads.NewCloneSetScaleController(r.client, r.recorder, r.parentController,
r.rolloutSpec, r.rolloutStatus, target), nil
}
@@ -353,9 +358,14 @@ func (r *Controller) GetWorkloadController() (workloads.WorkloadController, erro
if r.targetWorkload.GetKind() == reflect.TypeOf(apps.Deployment{}).Name() {
// check whether current rollout plan is for workload rolling or scaling
if r.sourceWorkload != nil {
klog.InfoS("using deployment rollout controller for this rolloutplan", "source workload name", source.Name, "namespace",
source.Namespace, "target workload name", target.Name, "namespace",
target.Namespace)
return workloads.NewDeploymentRolloutController(r.client, r.recorder, r.parentController,
r.rolloutSpec, r.rolloutStatus, source, target), nil
}
klog.InfoS("using deployment scale controller for this rolloutplan", "target workload name", target.Name, "namespace",
target.Namespace)
return workloads.NewDeploymentScaleController(r.client, r.recorder, r.parentController,
r.rolloutSpec, r.rolloutStatus, target), nil
}

2
pkg/controller/core.oam.dev/v1alpha2/appdeployment/suite_test.go
View File

@@ -100,7 +100,7 @@ var _ = BeforeSuite(func(done Done) {
// setup the controller manager since we need the component handler to run in the background
ctlManager, err = ctrl.NewManager(cfg, ctrl.Options{
Scheme: common.Scheme,
MetricsBindAddress: ":8081",
MetricsBindAddress: "0",
LeaderElection: false,
LeaderElectionNamespace: "default",
LeaderElectionID: "test",

2
pkg/controller/core.oam.dev/v1alpha2/application/suite_test.go
View File

@@ -146,7 +146,7 @@ var _ = BeforeSuite(func(done Done) {
// setup the controller manager since we need the component handler to run in the background
mgr, err = ctrl.NewManager(cfg, ctrl.Options{
Scheme: testScheme,
MetricsBindAddress: ":8080",
MetricsBindAddress: "0",
LeaderElection: false,
LeaderElectionNamespace: "default",
LeaderElectionID: "test",