From 1f94646c336758a15ea7a1779babe7e57066457b Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:12:42 -0400 Subject: [PATCH 1/9] client/doc: add trailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- client/doc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/doc.go b/client/doc.go index 2a8273fc7655..b4915c6a6a8a 100644 --- a/client/doc.go +++ b/client/doc.go @@ -115,7 +115,7 @@ // } // // // Connect to the remote SimpleStreams server -// d, err = lxd.ConnectSimpleStreams("https://cloud-images.ubuntu.com/releases", nil) +// d, err = lxd.ConnectSimpleStreams("https://cloud-images.ubuntu.com/releases/", nil) // if err != nil { // return err // } From 37f68e0d4b2eed5c6476b135f9400ed551553439 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:12:56 -0400 Subject: [PATCH 2/9] doc/howto/instances_create: add trailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- doc/howto/instances_create.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/howto/instances_create.md b/doc/howto/instances_create.md index b2d939f6efb1..27f2b75fa4c0 100644 --- a/doc/howto/instances_create.md +++ b/doc/howto/instances_create.md @@ -127,7 +127,7 @@ To create a container with an Ubuntu 24.04 LTS image from the `ubuntu` server us "source": { "alias": "24.04", "protocol": "simplestreams", - "server": "https://cloud-images.ubuntu.com/releases", + "server": "https://cloud-images.ubuntu.com/releases/", "type": "image" } }' @@ -154,7 +154,7 @@ To create a virtual machine with an Ubuntu 24.04 LTS image from the `ubuntu` ser "source": { "alias": "24.04", "protocol": "simplestreams", - "server": "https://cloud-images.ubuntu.com/releases", + "server": "https://cloud-images.ubuntu.com/releases/", "type": "image" }, "type": "virtual-machine" @@ -188,7 +188,7 @@ Or with a bigger disk: "source": { "alias": "24.04", "protocol": "simplestreams", - "server": "https://cloud-images.ubuntu.com/releases", + "server": "https://cloud-images.ubuntu.com/releases/", "type": "image" }, "type": "virtual-machine" @@ -220,7 +220,7 @@ To create a container and limit its resources to one vCPU and 8 GiB of RAM: "source": { "alias": "24.04", "protocol": "simplestreams", - "server": "https://cloud-images.ubuntu.com/releases", + "server": "https://cloud-images.ubuntu.com/releases/", "type": "image" } }' @@ -247,7 +247,7 @@ To create a virtual machine on the cluster member `micro2`, enter the following "source": { "alias": "24.04", "protocol": "simplestreams", - "server": "https://cloud-images.ubuntu.com/releases", + "server": "https://cloud-images.ubuntu.com/releases/", "type": "image" }, "type": "virtual-machine" @@ -293,7 +293,7 @@ To create a container with this instance type: "source": { "alias": "24.04", "protocol": "simplestreams", - "server": "https://cloud-images.ubuntu.com/releases", + "server": "https://cloud-images.ubuntu.com/releases/", "type": "image" } }' From d99e1202dda664f501e95592766593b969df2a4f Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:13:01 -0400 Subject: [PATCH 3/9] doc/howto/instances_routed_nic_vm: add trailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- doc/howto/instances_routed_nic_vm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/howto/instances_routed_nic_vm.md b/doc/howto/instances_routed_nic_vm.md index 5178fd29d8ff..ef1585fb803e 100644 --- a/doc/howto/instances_routed_nic_vm.md +++ b/doc/howto/instances_routed_nic_vm.md @@ -17,7 +17,7 @@ To configure the gateways with `cloud-init`, firstly initialize an instance: "source": { "alias": "24.04", "protocol": "simplestreams", - "server": "https://cloud-images.ubuntu.com/releases", + "server": "https://cloud-images.ubuntu.com/releases/", "type": "image" }, "type": "virtual-machine" From 2e8716d6e3b7c56ba1cc9bf6e8dc4d16979edded Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:13:24 -0400 Subject: [PATCH 4/9] doc/rest-api: add trailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- doc/rest-api.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/rest-api.yaml b/doc/rest-api.yaml index e81b9328e941..a4274ab3145d 100644 --- a/doc/rest-api.yaml +++ b/doc/rest-api.yaml @@ -1221,7 +1221,7 @@ definitions: x-go-name: Protocol server: description: URL of the source server - example: https://cloud-images.ubuntu.com/releases + example: https://cloud-images.ubuntu.com/releases/ type: string x-go-name: Server type: object @@ -1336,7 +1336,7 @@ definitions: x-go-name: Secret server: description: URL of the source server - example: https://cloud-images.ubuntu.com/releases + example: https://cloud-images.ubuntu.com/releases/ type: string x-go-name: Server type: @@ -2370,7 +2370,7 @@ definitions: x-go-name: Websockets server: description: Remote server URL (for remote images) - example: https://cloud-images.ubuntu.com/releases + example: https://cloud-images.ubuntu.com/releases/ type: string x-go-name: Server source: From 8461945d1bf0be2f7ba6a9bb6ae5d4c5b937c8bf Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:13:39 -0400 Subject: [PATCH 5/9] lxc/config/default: add trailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- lxc/config/default.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc/config/default.go b/lxc/config/default.go index 9b7c127b6a91..2b4737a17cf2 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -16,7 +16,7 @@ var ImagesRemote = Remote{ // UbuntuRemote is the Ubuntu image server (over simplestreams). var UbuntuRemote = Remote{ - Addr: "https://cloud-images.ubuntu.com/releases", + Addr: "https://cloud-images.ubuntu.com/releases/", Static: true, Public: true, Protocol: "simplestreams", From 1820e9f1e32c4d95d92c64d3c2d8ac99f3c69080 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:13:50 -0400 Subject: [PATCH 6/9] shared/api/image: add trailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- shared/api/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/api/image.go b/shared/api/image.go index f6b998db84de..5d0a48569fde 100644 --- a/shared/api/image.go +++ b/shared/api/image.go @@ -258,7 +258,7 @@ type ImageSource struct { Protocol string `json:"protocol" yaml:"protocol"` // URL of the source server - // Example: https://cloud-images.ubuntu.com/releases + // Example: https://cloud-images.ubuntu.com/releases/ Server string `json:"server" yaml:"server"` // Type of image (container or virtual-machine) From 4dfdce201540b110dbd7bf8daf1d5ff163127525 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:13:57 -0400 Subject: [PATCH 7/9] shared/api/instance: add trailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- shared/api/instance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/api/instance.go b/shared/api/instance.go index 966cd6e0aa8e..581e592f174a 100644 --- a/shared/api/instance.go +++ b/shared/api/instance.go @@ -368,7 +368,7 @@ type InstanceSource struct { Properties map[string]string `json:"properties,omitempty" yaml:"properties,omitempty"` // Remote server URL (for remote images) - // Example: https://cloud-images.ubuntu.com/releases + // Example: https://cloud-images.ubuntu.com/releases/ Server string `json:"server,omitempty" yaml:"server,omitempty"` // Remote server secret (for remote private images) From fd59bda4e0d4c6c1c35475cca1668eb2c452ab67 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:14:19 -0400 Subject: [PATCH 8/9] test/suites/remote: add tailing slash to `ubuntu:` URL Signed-off-by: Simon Deziel --- test/suites/remote.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/suites/remote.sh b/test/suites/remote.sh index f5da23ce0e28..c4aaf655c62a 100644 --- a/test/suites/remote.sh +++ b/test/suites/remote.sh @@ -28,8 +28,8 @@ test_remote_url() { # Check that we can add simplestream remotes with valid certs without confirmation if [ -z "${LXD_OFFLINE:-}" ]; then - lxc_remote remote add ubuntu1 https://cloud-images.ubuntu.com/releases --protocol=simplestreams - lxc_remote remote add ubuntu2 https://cloud-images.ubuntu.com:443/releases --protocol=simplestreams + lxc_remote remote add ubuntu1 https://cloud-images.ubuntu.com/releases/ --protocol=simplestreams + lxc_remote remote add ubuntu2 https://cloud-images.ubuntu.com:443/releases/ --protocol=simplestreams lxc_remote remote remove ubuntu1 lxc_remote remote remove ubuntu2 fi From 5baa18673eea484ba1b01f65b1f4cd0d325a5edb Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 26 Sep 2024 16:15:14 -0400 Subject: [PATCH 9/9] lxc/config/default: add trailing slash to `ubuntu-daily:` URL Signed-off-by: Simon Deziel --- lxc/config/default.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxc/config/default.go b/lxc/config/default.go index 2b4737a17cf2..37d1ca2356eb 100644 --- a/lxc/config/default.go +++ b/lxc/config/default.go @@ -24,7 +24,7 @@ var UbuntuRemote = Remote{ // UbuntuDailyRemote is the Ubuntu daily image server (over simplestreams). var UbuntuDailyRemote = Remote{ - Addr: "https://cloud-images.ubuntu.com/daily", + Addr: "https://cloud-images.ubuntu.com/daily/", Static: true, Public: true, Protocol: "simplestreams",