From ef6db2ef1de9ff4119289257e4370da6a472bd5d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 11 Aug 2023 22:45:48 +0900 Subject: [PATCH] templates: remove nomad Nomad is no longer free software: https://github.com/hashicorp/nomad/commit/b3e30b1dfa185d9437a25830522da47b91f78816 Signed-off-by: Akihiro Suda --- README.md | 1 - examples/README.md | 2 +- examples/nomad.yaml | 76 --------------------------------------------- 3 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 examples/nomad.yaml diff --git a/README.md b/README.md index 8b111524cf5..2b1e713c758 100644 --- a/README.md +++ b/README.md @@ -374,7 +374,6 @@ Container image builder examples: Container orchestrator examples: - [`./examples/k3s.yaml`](./examples/k3s.yaml): Kubernetes (k3s) - [`./examples/k8s.yaml`](./examples/k8s.yaml): Kubernetes (kubeadm) -- [`./examples/nomad.yaml`](./examples/nomad.yaml): Nomad The default Ubuntu image also contains LXD. Run `lima sudo lxc init` to set up LXD. diff --git a/examples/README.md b/examples/README.md index c31fcfb93ac..75783206504 100644 --- a/examples/README.md +++ b/examples/README.md @@ -40,7 +40,6 @@ Container orchestration: - [`faasd.yaml`](./faasd.yaml): [Faasd](https://docs.openfaas.com/deployment/faasd/) - [`k3s.yaml`](./k3s.yaml): Kubernetes via k3s - [`k8s.yaml`](./k8s.yaml): Kubernetes via kubeadm -- [`nomad.yaml`](./nomad.yaml): Nomad Optional feature enablers: - [`vmnet.yaml`](./vmnet.yaml): ⭐enable [`vmnet.framework`](../docs/network.md) @@ -59,6 +58,7 @@ Lost+found: - ~`experimental/apptainer.yaml`~: Moved to [`apptainer.yaml`](./apptainer.yaml) in Lima v0.13.0. - ~`experimental/{almalinux,centos-stream-9,oraclelinux,rocky}-9.yaml`~: Moved to [`almalinux-9.yaml`](./almalinux.yaml), [`centos-stream-9.yaml`](./centos-stream-9.yaml), [`oraclelinux-9.yaml`](./oraclelinux-9.yaml), and [`rocky-9.yaml`](./rocky-9.yaml) in Lima v0.13.0. +- ~`nomad.yaml`~: Removed in Lima v0.17.1, as Nomad is [no longer free software](https://github.com/hashicorp/nomad/commit/b3e30b1dfa185d9437a25830522da47b91f78816) ## Tier 1 diff --git a/examples/nomad.yaml b/examples/nomad.yaml deleted file mode 100644 index 079e68aec6c..00000000000 --- a/examples/nomad.yaml +++ /dev/null @@ -1,76 +0,0 @@ -# Deploy nomad with containerd -# $ limactl start ./nomad.yaml -# $ limactl shell nomad nomad -# -# See -# -# More examples can be found at: -# https://github.com/Roblox/nomad-driver-containerd/tree/master/example - -# This template requires Lima v0.7.0 or later. -images: -# Try to use release-yyyyMMdd image if available. Note that release-yyyyMMdd will be removed after several months. -- location: "https://cloud-images.ubuntu.com/releases/22.04/release-20230729/ubuntu-22.04-server-cloudimg-amd64.img" - arch: "x86_64" - digest: "sha256:d5b419272e01cd69bfc15cbbbc5700d2196242478a54b9f19746da3a1269b7c8" -- location: "https://cloud-images.ubuntu.com/releases/22.04/release-20230729/ubuntu-22.04-server-cloudimg-arm64.img" - arch: "aarch64" - digest: "sha256:5ecab49ff44f8e44954752bc9ef4157584b7bdc9e24f06031e777f60860a9d17" -# Fallback to the latest release image. -# Hint: run `limactl prune` to invalidate the cache -- location: "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img" - arch: "x86_64" -- location: "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-arm64.img" - arch: "aarch64" - -# Mounts are disabled in this template, but can be enabled optionally. -mounts: [] -containerd: - system: true - user: false -# See https://learn.hashicorp.com/tutorials/nomad/get-started-install -provision: -- mode: system - script: | - #!/bin/sh - command -v nomad >/dev/null 2>&1 && exit 0 - curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - - echo "deb https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list - apt-get update - apt-get install -y nomad consul golang-cfssl - sed -e '/^client/a \ \ cni_path = "/usr/local/libexec/cni"\n\ \ cni_config_dir = "/etc/cni/net.d"' -i /etc/nomad.d/nomad.hcl - # install containerd-driver - DRIVER_VERSION=0.9.4 - case $(uname -m) in - x86_64) - curl -sSL -o containerd-driver https://github.com/Roblox/nomad-driver-containerd/releases/download/v${DRIVER_VERSION}/containerd-driver - ;; - aarch64) - curl -sSL -o containerd-driver https://github.com/Roblox/nomad-driver-containerd/releases/download/v${DRIVER_VERSION}/containerd-driver-arm64 - ;; - esac - sudo install -D containerd-driver /opt/nomad/data/plugins/containerd-driver - cat </dev/null 2>&1; do sleep 3; done"; then - echo >&2 "nomad is not installed yet" - exit 1 - fi - hint: See "/var/log/cloud-init-output.log". in the guest