kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass lifecycle down to BootstrapScript

This commit is contained in:
John Gardiner Myers 2021-06-18 20:25:56 -07:00
parent 07474c6d30
commit 820b0ea115
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/model/bootstrapscript.go
View File

@ -54,10 +54,11 @@ type BootstrapScriptBuilder struct {
} }
type BootstrapScript struct { type BootstrapScript struct {
Name string Name string
ig *kops.InstanceGroup Lifecycle fi.Lifecycle
builder *BootstrapScriptBuilder ig *kops.InstanceGroup
resource fi.TaskDependentResource builder *BootstrapScriptBuilder
resource fi.TaskDependentResource
// alternateNameTasks are tasks that contribute api-server IP addresses. // alternateNameTasks are tasks that contribute api-server IP addresses.
alternateNameTasks []fi.HasAddress alternateNameTasks []fi.HasAddress
@ -227,10 +228,11 @@ func (b *BootstrapScriptBuilder) ResourceNodeUp(c *fi.ModelBuilderContext, ig *k
} }
task := &BootstrapScript{ task := &BootstrapScript{
Name: ig.Name, Name: ig.Name,
ig: ig, Lifecycle: b.Lifecycle,
builder: b, ig: ig,
caTask: caTask, builder: b,
caTask: caTask,
// TODO: use caTask.Keyset() and expose all CA certificates // TODO: use caTask.Keyset() and expose all CA certificates
ca: caTask.Certificate(), ca: caTask.Certificate(),
} }
@ -267,6 +269,10 @@ func (b *BootstrapScript) GetDependencies(tasks map[string]fi.Task) []fi.Task {
} }
func (b *BootstrapScript) Run(c *fi.Context) error { func (b *BootstrapScript) Run(c *fi.Context) error {
if b.Lifecycle == fi.LifecycleIgnore {
return nil
}
config, err := b.kubeEnv(b.ig, c, b.ca) config, err := b.kubeEnv(b.ig, c, b.ca)
if err != nil { if err != nil {
return err return err