Merge pull request #13643 from simondeziel/prepare-4.0.10-stable-4.0

Prepare 4.0.10 (stable-4.0)
canonical · Jun 21, 2024 · 67afb6a · 67afb6a
2 parents 81824b5 + 4fbc5b2
commit 67afb6a
Show file tree

Hide file tree

Showing 584 changed files with 2,647 additions and 2,632 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,7 +1,19 @@
 API:
-- doc/api-extensions.md
-- doc/rest-api.yaml
-- shared/api/**/*
+- changed-files:
+  - any-glob-to-any-file:
+    - doc/api-extensions.md
+    - doc/rest-api.yaml
+    - shared/api/**/*
 Documentation:
-- doc/**/*
-- .sphinx/**/*
+- changed-files:
+  - any-glob-to-any-file:
+    - doc/**/*
+
+"5.21 LTS":
+- base-branch: 'stable-5.21'
+
+"5.0 LTS":
+- base-branch: 'stable-5.0'
+
+"4.0 LTS":
+- base-branch: 'stable-4.0'
diff --git a/Makefile b/Makefile
@@ -53,10 +53,11 @@ lxd-p2c:
 .PHONY: deps
 deps:
 	@if [ ! -e "$(RAFT_PATH)" ]; then \
-		git clone --depth=1 "https://github.com/canonical/raft" "$(RAFT_PATH)"; \
+		git clone "https://github.com/canonical/raft" "$(RAFT_PATH)"; \
 	elif [ -e "$(RAFT_PATH)/.git" ]; then \
 		cd "$(RAFT_PATH)"; git pull; \
-	fi
+	fi; \
+	git reset --hard abf9c42a9bb63c24920ab9f0bfbc4b7a47e7e5f4
 
 	cd "$(RAFT_PATH)" && \
 		autoreconf -i && \
@@ -65,10 +66,11 @@ deps:
 
 	# dqlite
 	@if [ ! -e "$(DQLITE_PATH)" ]; then \
-		git clone --depth=1 "https://github.com/canonical/dqlite" "$(DQLITE_PATH)"; \
+		git clone "https://github.com/canonical/dqlite" "$(DQLITE_PATH)"; \
 	elif [ -e "$(DQLITE_PATH)/.git" ]; then \
 		cd "$(DQLITE_PATH)"; git pull; \
-	fi
+	fi; \
+	git reset --hard 50ee9af350b2fb4e79f9eb58db22c8a0927138de
 
 	cd "$(DQLITE_PATH)" && \
 		autoreconf -i && \

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 LXD is a next generation system container and virtual machine manager.
 It offers a unified user experience around full Linux systems running inside containers or virtual machines.
 
-It's image based with pre-made images available for a [wide number of Linux distributions](https://images.linuxcontainers.org)
+It's image based with pre-made images available for a [wide number of Linux distributions](https://images.lxd.canonical.com)
 and is built around a very powerful, yet pretty simple, REST API.
 
 

diff --git a/client/connection.go b/client/connection.go
@@ -15,9 +15,9 @@ import (
 	log "gopkg.in/inconshreveable/log15.v2"
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/logger"
-	"github.com/lxc/lxd/shared/simplestreams"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/logger"
+	"github.com/canonical/lxd/shared/simplestreams"
 )
 
 // ConnectionArgs represents a set of common connection properties

diff --git a/client/doc.go b/client/doc.go
@@ -115,7 +115,7 @@
 //  }
 //
 //  // Connect to the remote SimpleStreams server
-//  d, err = lxd.ConnectSimpleStreams("https://images.linuxcontainers.org", nil)
+//  d, err = lxd.ConnectSimpleStreams("https://images.lxd.canonical.com", nil)
 //  if err != nil {
 //    return err
 //  }

diff --git a/client/events.go b/client/events.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // The EventListener struct is used to interact with a LXD event stream

diff --git a/client/interfaces.go b/client/interfaces.go
@@ -8,9 +8,9 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pkg/sftp"
 
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
+	"github.com/canonical/lxd/shared/api"
+	"github.com/canonical/lxd/shared/cancel"
+	"github.com/canonical/lxd/shared/ioprogress"
 )
 
 // The Operation type represents a currently running operation.

diff --git a/client/lxd.go b/client/lxd.go
@@ -14,9 +14,9 @@ import (
 	"gopkg.in/macaroon-bakery.v2/bakery"
 	"gopkg.in/macaroon-bakery.v2/httpbakery"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/logger"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
+	"github.com/canonical/lxd/shared/logger"
 
 	neturl "net/url"
 )

diff --git a/client/lxd_certificates.go b/client/lxd_certificates.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Certificate handling functions

diff --git a/client/lxd_cluster.go b/client/lxd_cluster.go
@@ -3,7 +3,7 @@ package lxd
 import (
 	"fmt"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // GetCluster returns information about a cluster

diff --git a/client/lxd_containers.go b/client/lxd_containers.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
+	"github.com/canonical/lxd/shared/cancel"
+	"github.com/canonical/lxd/shared/ioprogress"
+	"github.com/canonical/lxd/shared/units"
 )
 
 // Container handling functions

diff --git a/client/lxd_events.go b/client/lxd_events.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Event handling functions

diff --git a/client/lxd_images.go b/client/lxd_images.go
@@ -12,11 +12,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
+	"github.com/canonical/lxd/shared/cancel"
+	"github.com/canonical/lxd/shared/ioprogress"
+	"github.com/canonical/lxd/shared/units"
 )
 
 // Image handling functions

diff --git a/client/lxd_instances.go b/client/lxd_instances.go
@@ -14,12 +14,12 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pkg/sftp"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/tcp"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
+	"github.com/canonical/lxd/shared/cancel"
+	"github.com/canonical/lxd/shared/ioprogress"
+	"github.com/canonical/lxd/shared/tcp"
+	"github.com/canonical/lxd/shared/units"
 )
 
 // Instance handling functions.

diff --git a/client/lxd_network_acls.go b/client/lxd_network_acls.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // GetNetworkACLNames returns a list of network ACL names.

diff --git a/client/lxd_network_forwards.go b/client/lxd_network_forwards.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // GetNetworkForwardAddresses returns a list of network forward listen addresses.

diff --git a/client/lxd_network_peer.go b/client/lxd_network_peer.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // GetNetworkPeerNames returns a list of network peer names.

diff --git a/client/lxd_network_zones.go b/client/lxd_network_zones.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // GetNetworkZoneNames returns a list of network zone names.

diff --git a/client/lxd_networks.go b/client/lxd_networks.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // GetNetworkNames returns a list of network names

diff --git a/client/lxd_operations.go b/client/lxd_operations.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // GetOperationUUIDs returns a list of operation uuids

diff --git a/client/lxd_profiles.go b/client/lxd_profiles.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Profile handling functions

diff --git a/client/lxd_projects.go b/client/lxd_projects.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Project handling functions

diff --git a/client/lxd_server.go b/client/lxd_server.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Server handling functions

diff --git a/client/lxd_storage_pools.go b/client/lxd_storage_pools.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Storage pool handling functions

diff --git a/client/lxd_storage_volumes.go b/client/lxd_storage_volumes.go
@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
-	"github.com/lxc/lxd/shared/cancel"
-	"github.com/lxc/lxd/shared/ioprogress"
-	"github.com/lxc/lxd/shared/units"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
+	"github.com/canonical/lxd/shared/cancel"
+	"github.com/canonical/lxd/shared/ioprogress"
+	"github.com/canonical/lxd/shared/units"
 )
 
 // Storage volumes handling function

diff --git a/client/lxd_warnings.go b/client/lxd_warnings.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Warning handling functions

diff --git a/client/operations.go b/client/operations.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gorilla/websocket"
 
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // The Operation type represents an ongoing LXD operation (asynchronous processing)

diff --git a/client/simplestreams.go b/client/simplestreams.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/lxc/lxd/shared/simplestreams"
+	"github.com/canonical/lxd/shared/simplestreams"
 )
 
 // ProtocolSimpleStreams implements a SimpleStreams API client

diff --git a/client/simplestreams_images.go b/client/simplestreams_images.go
@@ -10,8 +10,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
-	"github.com/lxc/lxd/shared/api"
+	"github.com/canonical/lxd/shared"
+	"github.com/canonical/lxd/shared/api"
 )
 
 // Image handling functions

diff --git a/client/util.go b/client/util.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/lxc/lxd/shared"
+	"github.com/canonical/lxd/shared"
 )
 
 func tlsHTTPClient(client *http.Client, tlsClientCert string, tlsClientKey string, tlsCA string, tlsServerCert string, insecureSkipVerify bool, proxy func(req *http.Request) (*url.URL, error)) (*http.Client, error) {

diff --git a/doc/database.md b/doc/database.md
@@ -56,7 +56,7 @@ against the local or global database, you can use the ``lxd sql`` command (run
 
 You should only need to do that in order to recover from broken updates or bugs.
 Please consult the LXD team first (creating a [GitHub
-issue](https://github.com/lxc/lxd/issues/new) or
+issue](https://github.com/canonical/lxd/issues/new) or
 [forum](https://discuss.linuxcontainers.org/) post).
 
 ## Running custom queries at LXD daemon startup

diff --git a/doc/external_resources.md b/doc/external_resources.md
@@ -4,5 +4,5 @@
 :maxdepth: 1
 
 Project repository <https://github.com/canonical/lxd>
-Image server <https://images.linuxcontainers.org>
+Image server <https://images.lxd.canonical.com>
 ```
diff --git a/doc/metadata.yaml b/doc/metadata.yaml
@@ -121,5 +121,5 @@ navigation:
           external: true
 
         - title: Image server
-          location: https://images.linuxcontainers.org
+          location: https://images.lxd.canonical.com
           external: true