Merge pull request #12896 from tomponline/tp-instance-type-files

Instance: Temporarily host the instance type preset files on Github

doc/external_resources.md

@@ -5,5 +5,4 @@
 :maxdepth: 1
 
 Project repository <https://github.com/canonical/lxd>
-Community image server <https://images.linuxcontainers.org>
 ```

doc/reference/index.md

@@ -24,6 +24,5 @@ Production server settings </reference/server_settings>
 /restapi_landing
 /server
 /reference/storage_drivers
-Community image server <https://images.linuxcontainers.org>
 Project repository <https://github.com/canonical/lxd>
 ```

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 {

meta/instance-types/.yaml

@@ -0,0 +1,3 @@
+aws: "aws.yaml"
+gce: "gce.yaml"
+azure: "azure.yaml"

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
+