From ae735604f628bd7ec31dba90b149a610b006167d Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Thu, 15 Feb 2024 10:58:50 +0000 Subject: [PATCH 1/3] doc: Remove references to blocked community image server Signed-off-by: Thomas Parrott --- doc/external_resources.md | 1 - doc/reference/index.md | 1 - 2 files changed, 2 deletions(-) diff --git a/doc/external_resources.md b/doc/external_resources.md index 5a42f191a1b1..fcc5e27f1b2f 100644 --- a/doc/external_resources.md +++ b/doc/external_resources.md @@ -5,5 +5,4 @@ :maxdepth: 1 Project repository -Community image server ``` diff --git a/doc/reference/index.md b/doc/reference/index.md index 2d798acf21d4..d1d94c53ec11 100644 --- a/doc/reference/index.md +++ b/doc/reference/index.md @@ -24,6 +24,5 @@ Production server settings /restapi_landing /server /reference/storage_drivers -Community image server Project repository ``` From 30727169c5c83439d309a4b213a6249752be577a Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Thu, 15 Feb 2024 11:01:47 +0000 Subject: [PATCH 2/3] meta/instance-types: Adds instance type preset files from https://images.linuxcontainers.org/meta/instance-types/ Temporarily hosting them in the github repo before the new image server is setup. Signed-off-by: Thomas Parrott --- meta/instance-types/.yaml | 3 + meta/instance-types/aws.yaml | 277 +++++++++++++++++++++++++++++++++ meta/instance-types/azure.yaml | 145 +++++++++++++++++ meta/instance-types/gce.yaml | 64 ++++++++ 4 files changed, 489 insertions(+) create mode 100644 meta/instance-types/.yaml create mode 100644 meta/instance-types/aws.yaml create mode 100644 meta/instance-types/azure.yaml create mode 100644 meta/instance-types/gce.yaml diff --git a/meta/instance-types/.yaml b/meta/instance-types/.yaml new file mode 100644 index 000000000000..d82f2e486c8c --- /dev/null +++ b/meta/instance-types/.yaml @@ -0,0 +1,3 @@ +aws: "aws.yaml" +gce: "gce.yaml" +azure: "azure.yaml" diff --git a/meta/instance-types/aws.yaml b/meta/instance-types/aws.yaml new file mode 100644 index 000000000000..07c8cd4300a3 --- /dev/null +++ b/meta/instance-types/aws.yaml @@ -0,0 +1,277 @@ +c1.medium: + cpu: 2.0 + mem: 1.7 +c1.xlarge: + cpu: 8.0 + mem: 7.0 +c3.2xlarge: + cpu: 8.0 + mem: 15.0 +c3.4xlarge: + cpu: 16.0 + mem: 30.0 +c3.8xlarge: + cpu: 32.0 + mem: 60.0 +c3.large: + cpu: 2.0 + mem: 3.75 +c3.xlarge: + cpu: 4.0 + mem: 7.5 +c4.2xlarge: + cpu: 8.0 + mem: 15.0 +c4.4xlarge: + cpu: 16.0 + mem: 30.0 +c4.8xlarge: + cpu: 36.0 + mem: 60.0 +c4.large: + cpu: 2.0 + mem: 3.75 +c4.xlarge: + cpu: 4.0 + mem: 7.5 +c5.18xlarge: + cpu: 72.0 + mem: 144.0 +c5.2xlarge: + cpu: 8.0 + mem: 16.0 +c5.4xlarge: + cpu: 16.0 + mem: 32.0 +c5.9xlarge: + cpu: 36.0 + mem: 72.0 +c5.large: + cpu: 2.0 + mem: 4.0 +c5.xlarge: + cpu: 4.0 + mem: 8.0 +cc2.8xlarge: + cpu: 32.0 + mem: 60.5 +cg1.4xlarge: + cpu: 16.0 + mem: 22.5 +cr1.8xlarge: + cpu: 32.0 + mem: 244.0 +d2.2xlarge: + cpu: 8.0 + mem: 61.0 +d2.4xlarge: + cpu: 16.0 + mem: 122.0 +d2.8xlarge: + cpu: 36.0 + mem: 244.0 +d2.xlarge: + cpu: 4.0 + mem: 30.5 +f1.16xlarge: + cpu: 64.0 + mem: 976.0 +f1.2xlarge: + cpu: 8.0 + mem: 122.0 +g2.2xlarge: + cpu: 8.0 + mem: 15.0 +g2.8xlarge: + cpu: 32.0 + mem: 60.0 +g3.16xlarge: + cpu: 64.0 + mem: 488.0 +g3.4xlarge: + cpu: 16.0 + mem: 122.0 +g3.8xlarge: + cpu: 32.0 + mem: 244.0 +hi1.4xlarge: + cpu: 16.0 + mem: 60.5 +hs1.8xlarge: + cpu: 16.0 + mem: 117.0 +i2.2xlarge: + cpu: 8.0 + mem: 61.0 +i2.4xlarge: + cpu: 16.0 + mem: 122.0 +i2.8xlarge: + cpu: 32.0 + mem: 244.0 +i2.xlarge: + cpu: 4.0 + mem: 30.5 +i3.16xlarge: + cpu: 64.0 + mem: 488.0 +i3.2xlarge: + cpu: 8.0 + mem: 61.0 +i3.4xlarge: + cpu: 16.0 + mem: 122.0 +i3.8xlarge: + cpu: 32.0 + mem: 244.0 +i3.large: + cpu: 2.0 + mem: 15.25 +i3.xlarge: + cpu: 4.0 + mem: 30.5 +m1.large: + cpu: 2.0 + mem: 7.5 +m1.medium: + cpu: 1.0 + mem: 3.75 +m1.small: + cpu: 1.0 + mem: 1.7 +m1.xlarge: + cpu: 4.0 + mem: 15.0 +m2.2xlarge: + cpu: 4.0 + mem: 34.2 +m2.4xlarge: + cpu: 8.0 + mem: 68.4 +m2.xlarge: + cpu: 2.0 + mem: 17.1 +m3.2xlarge: + cpu: 8.0 + mem: 30.0 +m3.large: + cpu: 2.0 + mem: 7.5 +m3.medium: + cpu: 1.0 + mem: 3.75 +m3.xlarge: + cpu: 4.0 + mem: 15.0 +m4.10xlarge: + cpu: 40.0 + mem: 160.0 +m4.16xlarge: + cpu: 64.0 + mem: 256.0 +m4.2xlarge: + cpu: 8.0 + mem: 32.0 +m4.4xlarge: + cpu: 16.0 + mem: 64.0 +m4.large: + cpu: 2.0 + mem: 8.0 +m4.xlarge: + cpu: 4.0 + mem: 16.0 +p2.16xlarge: + cpu: 64.0 + mem: 732.0 +p2.8xlarge: + cpu: 32.0 + mem: 488.0 +p2.xlarge: + cpu: 4.0 + mem: 61.0 +r3.2xlarge: + cpu: 8.0 + mem: 61.0 +r3.4xlarge: + cpu: 16.0 + mem: 122.0 +r3.8xlarge: + cpu: 32.0 + mem: 244.0 +r3.large: + cpu: 2.0 + mem: 15.25 +r3.xlarge: + cpu: 4.0 + mem: 30.5 +r4.16xlarge: + cpu: 64.0 + mem: 488.0 +r4.2xlarge: + cpu: 8.0 + mem: 61.0 +r4.4xlarge: + cpu: 16.0 + mem: 122.0 +r4.8xlarge: + cpu: 32.0 + mem: 244.0 +r4.large: + cpu: 2.0 + mem: 15.25 +r4.xlarge: + cpu: 4.0 + mem: 30.5 +t1.micro: + cpu: 1.0 + mem: 0.613 +t2.2xlarge: + cpu: 8.0 + mem: 32.0 +t2.large: + cpu: 2.0 + mem: 8.0 +t2.medium: + cpu: 2.0 + mem: 4.0 +t2.micro: + cpu: 1.0 + mem: 1.0 +t2.nano: + cpu: 1.0 + mem: 0.5 +t2.small: + cpu: 1.0 + mem: 2.0 +t2.xlarge: + cpu: 4.0 + mem: 16.0 +t3.2xlarge: + cpu: 8.0 + mem: 32.0 +t3.large: + cpu: 2.0 + mem: 8.0 +t3.medium: + cpu: 2.0 + mem: 4.0 +t3.micro: + cpu: 2.0 + mem: 1.0 +t3.nano: + cpu: 2.0 + mem: 0.5 +t3.small: + cpu: 2.0 + mem: 2.0 +t3.xlarge: + cpu: 4.0 + mem: 16.0 +x1.16xlarge: + cpu: 64.0 + mem: 976.0 +x1.32xlarge: + cpu: 128.0 + mem: 1952.0 + diff --git a/meta/instance-types/azure.yaml b/meta/instance-types/azure.yaml new file mode 100644 index 000000000000..001e67ebe82f --- /dev/null +++ b/meta/instance-types/azure.yaml @@ -0,0 +1,145 @@ +A10: + cpu: 8.0 + mem: 56.0 +A11: + cpu: 16.0 + mem: 112.0 +A5: + cpu: 2.0 + mem: 14.0 +A6: + cpu: 4.0 + mem: 28.0 +A7: + cpu: 8.0 + mem: 56.0 +A8: + cpu: 8.0 + mem: 56.0 +A9: + cpu: 16.0 + mem: 112.0 +ExtraLarge: + cpu: 8.0 + mem: 14.0 +ExtraSmall: + cpu: 1.0 + mem: 0.768 +Large: + cpu: 4.0 + mem: 7.0 +Medium: + cpu: 2.0 + mem: 3.5 +Small: + cpu: 1.0 + mem: 1.75 +Standard_A1_v2: + cpu: 1.0 + mem: 2.0 +Standard_A2_v2: + cpu: 2.0 + mem: 4.0 +Standard_A2m_v2: + cpu: 2.0 + mem: 16.0 +Standard_A4_v2: + cpu: 4.0 + mem: 8.0 +Standard_A4m_v2: + cpu: 4.0 + mem: 32.0 +Standard_A8_v2: + cpu: 8.0 + mem: 16.0 +Standard_A8m_v2: + cpu: 8.0 + mem: 64.0 +Standard_D1: + cpu: 1.0 + mem: 3.5 +Standard_D11: + cpu: 2.0 + mem: 14.0 +Standard_D11_v2: + cpu: 2.0 + mem: 14.0 +Standard_D12: + cpu: 4.0 + mem: 28.0 +Standard_D12_v2: + cpu: 4.0 + mem: 28.0 +Standard_D13: + cpu: 8.0 + mem: 56.0 +Standard_D13_v2: + cpu: 8.0 + mem: 56.0 +Standard_D14: + cpu: 16.0 + mem: 112.0 +Standard_D14_v2: + cpu: 16.0 + mem: 112.0 +Standard_D15_v2: + cpu: 20.0 + mem: 140.0 +Standard_D1_v2: + cpu: 1.0 + mem: 3.5 +Standard_D2: + cpu: 2.0 + mem: 7.0 +Standard_D2_v2: + cpu: 2.0 + mem: 7.0 +Standard_D3: + cpu: 4.0 + mem: 14.0 +Standard_D3_v2: + cpu: 4.0 + mem: 14.0 +Standard_D4: + cpu: 8.0 + mem: 28.0 +Standard_D4_v2: + cpu: 8.0 + mem: 28.0 +Standard_D5_v2: + cpu: 16.0 + mem: 56.0 +Standard_G1: + cpu: 2.0 + mem: 28.0 +Standard_G2: + cpu: 4.0 + mem: 56.0 +Standard_G3: + cpu: 8.0 + mem: 112.0 +Standard_G4: + cpu: 16.0 + mem: 224.0 +Standard_G5: + cpu: 32.0 + mem: 448.0 +Standard_H16: + cpu: 16.0 + mem: 112.0 +Standard_H16m: + cpu: 16.0 + mem: 224.0 +Standard_H16mr: + cpu: 16.0 + mem: 224.0 +Standard_H16r: + cpu: 16.0 + mem: 112.0 +Standard_H8: + cpu: 8.0 + mem: 56.0 +Standard_H8m: + cpu: 8.0 + mem: 112.0 + diff --git a/meta/instance-types/gce.yaml b/meta/instance-types/gce.yaml new file mode 100644 index 000000000000..9b36b6194924 --- /dev/null +++ b/meta/instance-types/gce.yaml @@ -0,0 +1,64 @@ +f1-micro: + cpu: 0.2 + mem: 0.6 +g1-small: + cpu: 0.5 + mem: 1.7 +n1-highcpu-16: + cpu: 16.0 + mem: 14.4 +n1-highcpu-2: + cpu: 2.0 + mem: 1.8 +n1-highcpu-32: + cpu: 32.0 + mem: 28.8 +n1-highcpu-4: + cpu: 4.0 + mem: 3.6 +n1-highcpu-64: + cpu: 64.0 + mem: 57.6 +n1-highcpu-8: + cpu: 8.0 + mem: 7.2 +n1-highmem-16: + cpu: 16.0 + mem: 104.0 +n1-highmem-2: + cpu: 2.0 + mem: 13.0 +n1-highmem-32: + cpu: 32.0 + mem: 208.0 +n1-highmem-4: + cpu: 4.0 + mem: 26.0 +n1-highmem-64: + cpu: 64.0 + mem: 416.0 +n1-highmem-8: + cpu: 8.0 + mem: 52.0 +n1-standard-1: + cpu: 1.0 + mem: 3.75 +n1-standard-16: + cpu: 16.0 + mem: 60.0 +n1-standard-2: + cpu: 2.0 + mem: 7.5 +n1-standard-32: + cpu: 32.0 + mem: 120.0 +n1-standard-4: + cpu: 4.0 + mem: 15.0 +n1-standard-64: + cpu: 64.0 + mem: 240.0 +n1-standard-8: + cpu: 8.0 + mem: 30.0 + From 5773a6b0735e0cea5bfcb5f5ee7c6750a384754b Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Thu, 15 Feb 2024 11:03:46 +0000 Subject: [PATCH 3/3] lxd/instance/instance/types: Use temporary hosting location of instance type preset files These will later be updated to the location of the new image server once online. Signed-off-by: Thomas Parrott --- lxd/instance_instance_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxd/instance_instance_types.go b/lxd/instance_instance_types.go index 8cdb5ff5e9c5..c8aa2b361fe6 100644 --- a/lxd/instance_instance_types.go +++ b/lxd/instance_instance_types.go @@ -103,7 +103,7 @@ func instanceRefreshTypesTask(d *Daemon) (task.Func, task.Schedule) { func instanceRefreshTypes(ctx context.Context, s *state.State) error { // Attempt to download the new definitions downloadParse := func(filename string, target any) error { - url := fmt.Sprintf("https://images.linuxcontainers.org/meta/instance-types/%s", filename) + url := fmt.Sprintf("https://raw.githubusercontent.com/canonical/lxd/main/meta/instance-types/%s", filename) httpClient, err := util.HTTPClient("", s.Proxy) if err != nil {