[go: nahoru, domu]
Skip to content
This repository has been archived by the owner on Jun 8, 2022. It is now read-only.

Enhance HealthScope #160

Merged
merged 4 commits into from
Aug 27, 2020
Merged

Enhance HealthScope #160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef666fe
modify e2e-test for healthscope & fix log odd params panic
captainroy-hy Aug 2, 2020
fe48c6d
enhance healthscope & add unit tests
captainroy-hy Aug 3, 2020
c9b38c7
remove general health check from HealthScope
captainroy-hy Aug 20, 2020
6068bc2
fix conflicts in e2e-test of healthscope
captainroy-hy Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
modify e2e-test for healthscope & fix log odd params panic 
Signed-off-by: roy wang <seiwy2010@gmail.com>
  • Loading branch information
@captainroy-hy
captainroy-hy committed Aug 2, 2020
commit ef666fedc777fea83e8a6c393df394aa930dcd3e
2 changes: 1 addition & 1 deletion ...troller/v1alpha2/core/workloads/containerizedworkload/containerizedworkload_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
eventObj, err := util.LocateParentAppConfig(ctx, r.Client, &workload)
if eventObj == nil {
// fallback to workload itself
log.Error(err, "workload", workload.Name)
log.Error(err, "workload", "name", workload.Name)
eventObj = &workload
}
deploy, err := r.renderDeployment(ctx, &workload)
Expand Down
7 changes: 7 additions & 0 deletions test/e2e-test/health_scope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ import (
"github.com/crossplane/oam-kubernetes-runtime/pkg/oam/util"
)

var (
var_int32_60 int32 = 60
)

var _ = Describe("HealthScope", func() {
ctx := context.Background()
namespace := "health-scope-test"
Expand Down Expand Up @@ -84,6 +88,9 @@ var _ = Describe("HealthScope", func() {
Name: healthScopeName,
Namespace: namespace,
},
Spec: v1alpha2.HealthScopeSpec{
ProbeTimeout: &var_int32_60,
},
}
logf.Log.Info("Creating health scope")
Expect(k8sClient.Create(ctx, &hs)).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{}))
Expand Down