New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat:devbox websocket. #5266

Open

bearslyricattack wants to merge 2 commits into labring:main from bearslyricattack:main

+461 −52

Member

bearslyricattack commented Dec 5, 2024

No description provided.

pull-request-size bot added the size/L label

sealos-ci-robot added area/cloud area/api labels

Member

sealos-ci-robot commented Dec 5, 2024 •

edited

Loading

🤖 Generated by lychee action

Summary

Status	Count
🔍 Total	2255
✅ Successful	530
⏳ Timeouts	0
🔀 Redirected	0
👻 Excluded	1722
❓ Unknown	0
🚫 Errors	1

Errors per input

Errors in docs/blog/zh-Hans/2024/how-to-deploy-and-configure-meilisearch-using-docker/index.md

[403] https://zhuanlan.zhihu.com/p/703201822 | Failed: Network error: Forbidden

Full action output

Full Github Actions output

lingdie reviewed

View reviewed changes

controllers/devbox/api/v1alpha1/devbox_types.go

@@ @@ -117,12 +118,15 @@ type DevboxSpec struct { @@
               type NetworkStatus struct {
               	// +kubebuilder:default=NodePort
-              	// +kubebuilder:validation:Enum=NodePort;Tailnet

Collaborator

lingdie Dec 5, 2024

make manifest to generate crd.

controllers/devbox/internal/controller/devbox_controller.go Outdated

+              		IngressClassName: &className,
+              		Rules: []networkingv1.IngressRule{
+              			{
+              				Host: devbox.Name + "." + r.HostPath,

Collaborator

lingdie Dec 5, 2024

use rand str as domain and set to devbox status. Use status.websocket.proxyDomain if exist.

Member Author

bearslyricattack Dec 6, 2024

already fix it.

controllers/devbox/internal/controller/devbox_controller.go Outdated

+              		}
+              	}
+              	podName := devbox.Name + "-proxy-pod"

Collaborator

lingdie Dec 5, 2024

use a func to generate proxy pod name.

Member Author

bearslyricattack Dec 6, 2024

already fix it.

controllers/devbox/internal/controller/devbox_controller.go

+              		return err
+              	}
+              	sshPort := "22"

Collaborator

lingdie Dec 5, 2024

What is the purpose of this code?

Member Author

bearslyricattack Dec 6, 2024

already fix it.

controllers/devbox/internal/controller/devbox_controller.go Outdated

+              						"sh",
+              						"-c",
+              					},
+              					Args: []string{

Collaborator

lingdie Dec 5, 2024

use a func to generate this...

Member Author

bearslyricattack Dec 6, 2024

already fix it.

controllers/devbox/internal/controller/devbox_controller.go Outdated

+              			proxySvc.Spec.Ports[0].Name = expectServiceSpec.Ports[0].Name
+              			proxySvc.Spec.Ports[0].Port = expectServiceSpec.Ports[0].Port
+              			proxySvc.Spec.Ports[0].TargetPort = expectServiceSpec.Ports[0].TargetPort
+              			proxySvc.Spec.Ports[0].Protocol = expectServiceSpec.Ports[0].Protocol

Collaborator

lingdie Dec 5, 2024

no need to do these checks...

Member Author

bearslyricattack Dec 6, 2024

already fix it.

controllers/devbox/internal/controller/devbox_controller.go Outdated

Comment on lines 419 to 448

+              	runtimecr, err := r.getRuntime(ctx, devbox)
+              	if err != nil {
+              		return err
+              	}
+              	var servicePorts []corev1.ServicePort
+              	for _, port := range runtimecr.Spec.Config.Ports {
+              		servicePorts = append(servicePorts, corev1.ServicePort{
+              			Name:       port.Name,
+              			Port:       port.ContainerPort,
+              			TargetPort: intstr.FromInt32(port.ContainerPort),
+              			Protocol:   port.Protocol,
+              		})
+              	}
+              	if len(servicePorts) == 0 {
+              		servicePorts = []corev1.ServicePort{
+              			{
+              				Name:       "devbox-ssh-port",
+              				Port:       22,
+              				TargetPort: intstr.FromInt32(22),
+              				Protocol:   corev1.ProtocolTCP,
+              			},
+              		}
+              	}

Collaborator

lingdie Dec 5, 2024

mv to a func.

Member Author

bearslyricattack Dec 6, 2024

already fix it.

controllers/devbox/internal/controller/devbox_controller.go

+              	return nil
+              }
+              func (r *DevboxReconciler) syncPodSvc(ctx context.Context, devbox *devboxv1alpha1.Devbox, recLabels map[string]string, servicePorts []corev1.ServicePort) error {

Collaborator

lingdie Dec 5, 2024

dup: https://github.com/labring/sealos/pull/5266/files#diff-594eeb45fe09e476d96e82352ba2338236c0feba2c20c417a8339e776d865bb8L370-L398

controllers/devbox/cmd/main.go Outdated

@@ @@ -93,6 +96,9 @@ func main() { @@
               	flag.Float64Var(&requestMemoryRate, "request-memory-rate", 10, "The request rate of memory limit in devbox.")
               	flag.StringVar(&requestEphemeralStorage, "request-ephemeral-storage", "500Mi", "The request value of ephemeral storage in devbox.")
               	flag.StringVar(&limitEphemeralStorage, "limit-ephemeral-storage", "10Gi", "The limit value of ephemeral storage in devbox.")
+              	flag.StringVar(&webSocketImage, "websocket-image", "bearslyricattack/chisel:1.0", "The image name of devbox websocket proxy pod")
+              	flag.StringVar(&hostPath, "host-path", "sealoshzh.site", "The host path of devbox ingress")

Collaborator

lingdie Dec 5, 2024

rename to websocket-proxy-domain

Member Author

bearslyricattack Dec 6, 2024

already fix it.

controllers/devbox/internal/controller/helper/devbox.go Outdated

Comment on lines 447 to 454

+              		Requests: corev1.ResourceList{
+              			corev1.ResourceCPU:    resource.MustParse("100m"),
+              			corev1.ResourceMemory: resource.MustParse("100Mi"),
+              		},
+              		Limits: corev1.ResourceList{
+              			corev1.ResourceCPU:    resource.MustParse("100m"),
+              			corev1.ResourceMemory: resource.MustParse("100Mi"),
+              		},

Collaborator

lingdie Dec 5, 2024

requset use 10m, limit use 50m.

Member Author

bearslyricattack Dec 6, 2024

already fix it.

codecov bot commented Dec 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.97%. Comparing base (b57e851) to head (2051685).
Report is 88 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #5266   +/-   ##
=======================================
  Coverage   61.97%   61.97%           
=======================================
  Files           8        8           
  Lines         647      647           
=======================================
  Hits          401      401           
  Misses        200      200           
  Partials       46       46

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

pull-request-size bot added size/XL and removed size/L labels

bearslyricattack force-pushed the main branch 3 times, most recently from 0bb2886 to 8efd4fe Compare

December 20, 2024 09:34

bearslyricattack deployed to Preview

December 20, 2024 09:34

— with

GitHub Actions View deployment

sealos-ci-robot added the kind/documentation label


          feat:devbox controller support websocket

7369a80

feat:devbox controller support websocket

bearslyricattack force-pushed the main branch from 8efd4fe to 384d288 Compare

December 20, 2024 09:37

Member

sealos-ci-robot commented Dec 20, 2024 •

edited

Loading

📘 Preview documentation website

👀 Visit Preview

bearslyricattack deployed to Preview

December 20, 2024 09:41

— with

GitHub Actions View deployment

sealos-ci-robot removed the kind/documentation label


          chore(fmt): format code

676a495

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

feat:devbox controller support websocket

docs: change blog url (labring#5251)

Signed-off-by: Carson Yang <[email protected]>

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

chore(fmt): format code

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

feat:devbox controller support websocket

chore(fmt): format code

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

feat:websocket auto shutdown

feat:websocket auto shutdown

chore(fmt): format code

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

chore(fmt): format code

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

feat:websocket auto shutdown

Delete tencent9825051126872297210.txt

bearslyricattack force-pushed the main branch from d178398 to 676a495 Compare

December 20, 2024 09:42

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/api area/cloud size/XL