From c02434269ff596569dfc33be6d2ba2f89ae3733a Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 23 Dec 2020 17:08:20 +0200 Subject: [PATCH] Fix cluster setup when KOPS_ARCH is set --- pkg/model/bootstrapscript.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index f7c78c5b6f..1c3bcca768 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -231,16 +231,28 @@ func (b *BootstrapScript) GetDependencies(tasks map[string]fi.Task) []fi.Task { func (b *BootstrapScript) Run(c *fi.Context) error { functions := template.FuncMap{ "NodeUpSourceAmd64": func() string { - return strings.Join(b.builder.NodeUpAssets[architectures.ArchitectureAmd64].Locations, ",") + if b.builder.NodeUpAssets[architectures.ArchitectureAmd64] != nil { + return strings.Join(b.builder.NodeUpAssets[architectures.ArchitectureAmd64].Locations, ",") + } + return "" }, "NodeUpSourceHashAmd64": func() string { - return b.builder.NodeUpAssets[architectures.ArchitectureAmd64].Hash.Hex() + if b.builder.NodeUpAssets[architectures.ArchitectureAmd64] != nil { + return b.builder.NodeUpAssets[architectures.ArchitectureAmd64].Hash.Hex() + } + return "" }, "NodeUpSourceArm64": func() string { - return strings.Join(b.builder.NodeUpAssets[architectures.ArchitectureArm64].Locations, ",") + if b.builder.NodeUpAssets[architectures.ArchitectureArm64] != nil { + return strings.Join(b.builder.NodeUpAssets[architectures.ArchitectureArm64].Locations, ",") + } + return "" }, "NodeUpSourceHashArm64": func() string { - return b.builder.NodeUpAssets[architectures.ArchitectureArm64].Hash.Hex() + if b.builder.NodeUpAssets[architectures.ArchitectureArm64] != nil { + return b.builder.NodeUpAssets[architectures.ArchitectureArm64].Hash.Hex() + } + return "" }, "KubeEnv": func() (string, error) { return b.kubeEnv(b.ig, c)