Merge branch 'master' into v1.7207.0

Author: yfodil

internal/namespaces/edge_services/v1beta1/edge_services_cli.go

@@ -1249,6 +1249,13 @@ func edgeServicesBackendStageCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "scaleway-lb.lbs.{index}.has-websocket",
+				Short:      `Defines whether to forward websocket requests to the load balancer`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "pipeline-id",
 				Short:      `Pipeline ID the Backend stage belongs to`,
@@ -1370,6 +1377,13 @@ func edgeServicesBackendStageUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "scaleway-lb.lbs.{index}.has-websocket",
+				Short:      `Defines whether to forward websocket requests to the load balancer`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "pipeline-id",
 				Short:      `Pipeline ID the Backend stage belongs to`,