From d6e74ef9a1ae8092fb944d0cc66ca59e6eb966bb Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 23 Feb 2024 23:02:05 +0900 Subject: [PATCH] Install nerdctl on nodes --- nodeup/pkg/model/nerdctl.go | 65 ++++++++++++++++++++++++++++ upup/pkg/fi/cloudup/apply_cluster.go | 7 +++ upup/pkg/fi/cloudup/nerdctl.go | 38 ++++++++++++++++ upup/pkg/fi/nodeup/command.go | 1 + 4 files changed, 111 insertions(+) create mode 100644 nodeup/pkg/model/nerdctl.go create mode 100644 upup/pkg/fi/cloudup/nerdctl.go diff --git a/nodeup/pkg/model/nerdctl.go b/nodeup/pkg/model/nerdctl.go new file mode 100644 index 0000000000..d78c42918f --- /dev/null +++ b/nodeup/pkg/model/nerdctl.go @@ -0,0 +1,65 @@ +package model + +import ( + "fmt" + + "k8s.io/klog/v2" + "k8s.io/kops/upup/pkg/fi" + "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" + "k8s.io/kops/util/pkg/distributions" +) + +type NerdctlBuilder struct { + *NodeupModelContext +} + +var _ fi.NodeupModelBuilder = &NerdctlBuilder{} + +func (b *NerdctlBuilder) Build(c *fi.NodeupModelBuilderContext) error { + if b.skipInstall() { + klog.Info("SkipInstall is set to true; won't install nerdctl") + return nil + } + + assetName := "nerdctl" + assetPath := "" + asset, err := b.Assets.Find(assetName, assetPath) + if err != nil { + return fmt.Errorf("unable to locate asset %q", assetName) + } + + c.AddTask(&nodetasks.File{ + Path: b.nerdctlPath(), + Contents: asset, + Type: nodetasks.FileType_File, + Mode: s("0755"), + }) + + return nil +} + +func (b *NerdctlBuilder) binaryPath() string { + path := "/usr/local/bin" + if b.Distribution == distributions.DistributionFlatcar { + path = "/opt/kops/bin" + } + if b.Distribution == distributions.DistributionContainerOS { + path = "/home/kubernetes/bin" + } + return path + +} + +func (b *NerdctlBuilder) nerdctlPath() string { + return b.binaryPath() + "/nerdctl" +} + +func (b *NerdctlBuilder) skipInstall() bool { + d := b.NodeupConfig.ContainerdConfig + + if d == nil { + return false + } + + return d.SkipInstall +} diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 2b9b123bab..43403eef16 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -1145,6 +1145,13 @@ func (c *ApplyClusterCmd) addFileAssets(assetBuilder *assets.AssetBuilder) error if runcAssetUrl != nil && runcAssetHash != nil { c.Assets[arch] = append(c.Assets[arch], mirrors.BuildMirroredAsset(runcAssetUrl, runcAssetHash)) } + nerdctlAssetUrl, nerdctlAssetHash, err := findNerdctlAsset(c.Cluster, assetBuilder, arch) + if err != nil { + return err + } + if nerdctlAssetUrl != nil && nerdctlAssetHash != nil { + c.Assets[arch] = append(c.Assets[arch], mirrors.BuildMirroredAsset(nerdctlAssetUrl, nerdctlAssetHash)) + } } asset, err := NodeUpAsset(assetBuilder, arch) diff --git a/upup/pkg/fi/cloudup/nerdctl.go b/upup/pkg/fi/cloudup/nerdctl.go new file mode 100644 index 0000000000..207e5f71fe --- /dev/null +++ b/upup/pkg/fi/cloudup/nerdctl.go @@ -0,0 +1,38 @@ +package cloudup + +import ( + "fmt" + "net/url" + + "k8s.io/kops/pkg/apis/kops" + "k8s.io/kops/pkg/assets" + "k8s.io/kops/util/pkg/architectures" + "k8s.io/kops/util/pkg/hashing" +) + +const ( + nerdctlAssetUrlAmd64 = "https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-amd64.tar.gz" + nerdctlAssetUrlArm64 = "https://github.com/containerd/nerdctl/releases/download/v1.7.4/nerdctl-1.7.4-linux-arm64.tar.gz" + nerdctlAssetHashAmd64 = "71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7" + nerdctlAssetHashArm64 = "d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d" +) + +func findNerdctlAsset(c *kops.Cluster, assetBuilder *assets.AssetBuilder, arch architectures.Architecture) (*url.URL, *hashing.Hash, error) { + if c.Spec.Containerd == nil { + return nil, nil, fmt.Errorf("unable to find containerd config") + } + + var assetURL, assetHash string + switch arch { + case architectures.ArchitectureAmd64: + assetURL = nerdctlAssetUrlAmd64 + assetHash = nerdctlAssetHashAmd64 + case architectures.ArchitectureArm64: + assetURL = nerdctlAssetUrlArm64 + assetHash = nerdctlAssetHashArm64 + default: + return nil, nil, fmt.Errorf("unknown arch for nerdctl binaries asset: %s", arch) + } + + return findAssetsUrlHash(assetBuilder, assetURL, assetHash) +} diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go index f76eaea851..33b433e377 100644 --- a/upup/pkg/fi/nodeup/command.go +++ b/upup/pkg/fi/nodeup/command.go @@ -314,6 +314,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error { loader.Builders = append(loader.Builders, &model.KopsControllerBuilder{NodeupModelContext: modelContext}) loader.Builders = append(loader.Builders, &model.WarmPoolBuilder{NodeupModelContext: modelContext}) loader.Builders = append(loader.Builders, &model.PrefixBuilder{NodeupModelContext: modelContext}) + loader.Builders = append(loader.Builders, &model.NerdctlBuilder{NodeupModelContext: modelContext}) loader.Builders = append(loader.Builders, &networking.CommonBuilder{NodeupModelContext: modelContext}) loader.Builders = append(loader.Builders, &networking.CalicoBuilder{NodeupModelContext: modelContext})