From e0b19173ff44ada7b18efa50d593320898f40413 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Wed, 12 Jun 2024 12:52:16 +0100 Subject: [PATCH] Remove Equinix Metal Equinix Metal is too expensive to dedicate a whole bare-metal host to a single inlets tunnel. Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- README.md | 13 ++++++------- controller.go | 14 +------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index c9b2e6ba..43b60e5a 100644 --- a/README.md +++ b/README.md @@ -157,14 +157,13 @@ These costs need to be treated as an estimate and will depend on your bandwidth | Provider | Price per month | Price per hour | OS image | CPU | Memory | Boot time | | ------------------------------------------------------------------ | --------------: | -------------: | -----------: | --: | -----: | --------: | -| [Google Compute Engine](https://cloud.google.com/compute) | * ~\$4.28 | ~\$0.006 | Ubuntu 20.04 | 1 | 614MB | ~3-15s | -| [Equinix-Metal](https://metal.equinix.com/) | ~\$360 | \$0.50 | Ubuntu 20.04 | 1 | 32GB | ~45-60s | -| [Digital Ocean](https://www.digitalocean.com/pricing/#Compute) | \$5 | ~\$0.0068 | Ubuntu 18.04 | 1 | 1GB | ~20-30s | -| [Scaleway](https://www.scaleway.com/en/pricing/#virtual-instances) | 5.84€ | 0.01€ | Ubuntu 20.04 | 2 | 2GB | 3-5m | +| [Google Compute Engine](https://cloud.google.com/compute) | * ~\$4.28 | ~\$0.006 | Ubuntu 22.04 | 1 | 614MB | ~3-15s | +| [Digital Ocean](https://www.digitalocean.com/pricing/#Compute) | \$5 | ~\$0.0068 | Ubuntu 22.04 | 1 | 1GB | ~20-30s | +| [Scaleway](https://www.scaleway.com/en/pricing/#virtual-instances) | 5.84€ | 0.01€ | Ubuntu 22.04 | 2 | 2GB | 3-5m | | [Amazon Elastic Computing 2](https://calculator.aws/#/createCalculator/EC2s) | $3.796 | $0.0052 | Ubuntu 20.04 | 1 | 1GB | 3-5m | -| [Linode](https://www.linode.com/pricing/) | $5 | $0.0075 | Ubuntu 20.04 | 1 | 1GB | ~10-30s | -| [Azure](https://azureprice.net/?cores=1,1&ram=0,11400) | $4.53 | $0.0062 | Ubuntu 20.04 | 1 | 0.5GB | 2-4min | -| [Hetzner](https://www.hetzner.com/cloud) | 4.15€ | €0.007 | Ubuntu 20.04 | 1 | 2GB | ~5-10s | +| [Linode](https://www.linode.com/pricing/) | $5 | $0.0075 | Ubuntu 22.04 | 1 | 1GB | ~10-30s | +| [Azure](https://azureprice.net/?cores=1,1&ram=0,11400) | $4.53 | $0.0062 | Ubuntu 22.04 | 1 | 0.5GB | 2-4min | +| [Hetzner](https://www.hetzner.com/cloud) | 4.15€ | €0.007 | Ubuntu 22.04 | 1 | 2GB | ~5-10s | * The first f1-micro instance in a GCP Project (the default instance type for inlets-operator) is free for 720hrs(30 days) a month diff --git a/controller.go b/controller.go index fef6c7eb..ad871590 100644 --- a/controller.go +++ b/controller.go @@ -756,17 +756,7 @@ func getHostConfig(c *Controller, tunnel *inletsv1alpha1.Tunnel, service *corev1 inletsPort := inletsPROControlPort switch c.infraConfig.Provider { - case "equinix-metal": - host = provision.BasicHost{ - Name: tunnel.Name, - OS: "ubuntu_20_04", - Plan: "c3.small.x86", - Region: c.infraConfig.Region, - UserData: userData, - Additional: map[string]string{ - "project_id": c.infraConfig.ProjectID, - }, - } + case "digitalocean": host = provision.BasicHost{ Name: tunnel.Name, @@ -905,8 +895,6 @@ func getProvisioner(c *Controller) (provision.Provisioner, error) { var provisioner provision.Provisioner switch c.infraConfig.Provider { - case "equinix-metal": - provisioner, err = provision.NewEquinixMetalProvisioner(c.infraConfig.GetAccessKey()) case "digitalocean": provisioner, err = provision.NewDigitalOceanProvisioner(c.infraConfig.GetAccessKey()) case "scaleway":