Merge branch 'master' into v1.5597.0

Author: remyleone

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/docker/docker v27.3.1+incompatible
 	github.com/dustin/go-humanize v1.0.1
 	github.com/fatih/color v1.17.0
-	github.com/getsentry/sentry-go v0.29.0
+	github.com/getsentry/sentry-go v0.29.1
 	github.com/ghodss/yaml v1.0.0
 	github.com/gorilla/websocket v1.5.3
 	github.com/hashicorp/go-version v1.7.0

go.sum

@@ -230,8 +230,8 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
 github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg=
-github.com/getsentry/sentry-go v0.29.0 h1:YtWluuCFg9OfcqnaujpY918N/AhCCwarIDWOYSBAjCA=
-github.com/getsentry/sentry-go v0.29.0/go.mod h1:jhPesDAL0Q0W2+2YEuVOvdWmVtdsr1+jtBrlDEVWwLY=
+github.com/getsentry/sentry-go v0.29.1 h1:DyZuChN8Hz3ARxGVV8ePaNXh1dQ7d76AiB117xcREwA=
+github.com/getsentry/sentry-go v0.29.1/go.mod h1:x3AtIzN01d6SiWkderzaH28Tm0lgkafpJ5Bm3li39O0=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=

internal/namespaces/instance/v1/instance_cli.go

@@ -651,12 +651,6 @@ func instanceServerUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			{
-				Name:       "bootscript",
-				Required:   false,
-				Deprecated: true,
-				Positional: false,
-			},
 			{
 				Name:       "dynamic-ip-required",
 				Required:   false,
@@ -1117,13 +1111,6 @@ func instanceImageCreate() *core.Command {
 				Positional: false,
 				EnumValues: []string{"unknown_arch", "x86_64", "arm", "arm64"},
 			},
-			{
-				Name:       "default-bootscript",
-				Short:      `Default bootscript of the image`,
-				Required:   false,
-				Deprecated: true,
-				Positional: false,
-			},
 			{
 				Name:       "extra-volumes.{key}.id",
 				Short:      `UUID of the volume`,