Skip to content

Commit 6825f39

Browse files
committed
fix after_create hook
1 parent f1a5a3c commit 6825f39

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

cluster/calcium/create.go

+11-4
Original file line numberDiff line numberDiff line change
@@ -302,10 +302,17 @@ func (c *Calcium) doDeployOneWorkload(
302302
}
303303

304304
// deal with hook
305-
if len(opts.AfterCreate) > 0 && workload.Hook != nil {
306-
workload.Hook = &types.Hook{
307-
AfterStart: append(opts.AfterCreate, workload.Hook.AfterStart...),
308-
Force: workload.Hook.Force,
305+
if len(opts.AfterCreate) > 0 {
306+
if workload.Hook != nil {
307+
workload.Hook = &types.Hook{
308+
AfterStart: append(opts.AfterCreate, workload.Hook.AfterStart...),
309+
Force: workload.Hook.Force,
310+
}
311+
} else {
312+
workload.Hook = &types.Hook{
313+
AfterStart: opts.AfterCreate,
314+
Force: opts.IgnoreHook,
315+
}
309316
}
310317
}
311318

0 commit comments

Comments
 (0)