add proxy

Author: walnuts1018

api/v1alpha1/codeserver_types.go

@@ -70,6 +70,9 @@ type CodeServerSpec struct {
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 
 	IngressClassName string `json:"ingressClassName,omitempty"`
+
+	// PublicProxyPorts specifies the public proxy ports for code server
+	PublicProxyPorts []int32 `json:"publicProxyPorts,omitempty"`
 }
 
 // CodeServerStatus defines the observed state of CodeServer

api/v1alpha1/zz_generated.deepcopy.go

@@ -216,6 +216,13 @@ spec:
                   type: string
                 description: Specifies the node selector for scheduling.
                 type: object
+              publicProxyPorts:
+                description: PublicProxyPorts specifies the public proxy ports for
+                  code server
+                items:
+                  format: int32
+                  type: integer
+                type: array
               resources:
                 description: Specifies the resource requirements for code server pod.
                 properties:

charts/code-server-operator/crds/codeserver-crd.yaml

@@ -208,6 +208,13 @@ spec:
                           type: string
                         description: Specifies the node selector for scheduling.
                         type: object
+                      publicProxyPorts:
+                        description: PublicProxyPorts specifies the public proxy ports
+                          for code server
+                        items:
+                          format: int32
+                          type: integer
+                        type: array
                       resources:
                         description: Specifies the resource requirements for code
                           server pod.

charts/code-server-operator/crds/codeserverdeployment-crd.yaml

@@ -208,6 +208,13 @@ spec:
                           type: string
                         description: Specifies the node selector for scheduling.
                         type: object
+                      publicProxyPorts:
+                        description: PublicProxyPorts specifies the public proxy ports
+                          for code server
+                        items:
+                          format: int32
+                          type: integer
+                        type: array
                       resources:
                         description: Specifies the resource requirements for code
                           server pod.

config/crd/bases/cs.walnuts.dev_codeserverdeployments.yaml

@@ -206,6 +206,13 @@ spec:
                   type: string
                 description: Specifies the node selector for scheduling.
                 type: object
+              publicProxyPorts:
+                description: PublicProxyPorts specifies the public proxy ports for
+                  code server
+                items:
+                  format: int32
+                  type: integer
+                type: array
               resources:
                 description: Specifies the resource requirements for code server pod.
                 properties:

config/crd/bases/cs.walnuts.dev_codeservers.yaml

@@ -26,3 +26,5 @@ spec:
       imagePullSecrets:
         - name: ghcr-login-secret
       domain: "walnuts.dev"
+      publicProxyPorts:
+        - 8080

config/samples/cs_v1alpha1_codeserverdeployment.yaml

@@ -395,6 +395,23 @@ func (r *CodeServerReconciler) reconcileService(ctx context.Context, codeServer
 		return fmt.Errorf("failed to create controller reference: %w", err)
 	}
 
+	ports := []*corev1apply.ServicePortApplyConfiguration{
+		corev1apply.ServicePort().
+			WithName("http").
+			WithProtocol(corev1.ProtocolTCP).
+			WithPort(codeServer.Spec.ContainerPort).
+			WithTargetPort(intstr.FromInt32(codeServer.Spec.ContainerPort)),
+	}
+
+	for _, port := range codeServer.Spec.PublicProxyPorts {
+		ports = append(ports, corev1apply.ServicePort().
+			WithName(fmt.Sprintf("http-%d", port)).
+			WithProtocol(corev1.ProtocolTCP).
+			WithPort(port).
+			WithTargetPort(intstr.FromInt32(port)),
+		)
+	}
+
 	service := corev1apply.Service(codeServer.Name, codeServer.Namespace).
 		WithLabels(map[string]string{
 			"app.kubernetes.io/name":       CodeServer,
@@ -404,11 +421,7 @@ func (r *CodeServerReconciler) reconcileService(ctx context.Context, codeServer
 		WithOwnerReferences(owner).
 		WithSpec(corev1apply.ServiceSpec().
 			WithType(corev1.ServiceTypeClusterIP).
-			WithPorts(corev1apply.ServicePort().
-				WithName("http").
-				WithProtocol(corev1.ProtocolTCP).
-				WithPort(codeServer.Spec.ContainerPort).
-				WithTargetPort(intstr.FromInt32(codeServer.Spec.ContainerPort)),
+			WithPorts(ports...,
 			).
 			WithSelector(map[string]string{
 				"app.kubernetes.io/name":       CodeServer,
@@ -464,33 +477,56 @@ func (r *CodeServerReconciler) reconcileIngress(ctx context.Context, codeServer
 	}
 	host := fmt.Sprintf("%s.%s", codeServer.Name, url.String())
 
+	paths := []*networkingv1apply.HTTPIngressPathApplyConfiguration{networkingv1apply.HTTPIngressPath().
+		WithPath("/").
+		WithPathType(networkingv1.PathTypePrefix).
+		WithBackend(networkingv1apply.IngressBackend().
+			WithService(networkingv1apply.IngressServiceBackend().
+				WithName(codeServer.Name).
+				WithPort(networkingv1apply.ServiceBackendPort().
+					WithName("http"),
+				),
+			),
+		),
+	}
+
+	for _, port := range codeServer.Spec.PublicProxyPorts {
+		paths = append(paths, networkingv1apply.HTTPIngressPath().
+			WithPath(fmt.Sprintf("/proxy/%d", port)).
+			WithPathType(networkingv1.PathTypePrefix).
+			WithBackend(networkingv1apply.IngressBackend().
+				WithService(networkingv1apply.IngressServiceBackend().
+					WithName(codeServer.Name).
+					WithPort(networkingv1apply.ServiceBackendPort().
+						WithName(fmt.Sprintf("http-%d", port)),
+					),
+				),
+			),
+		)
+	}
+
+	spec := networkingv1apply.IngressSpec().
+		WithRules(networkingv1apply.IngressRule().
+			WithHost(host).
+			WithHTTP(networkingv1apply.HTTPIngressRuleValue().
+				WithPaths(
+					paths...,
+				),
+			),
+		)
+
+	if codeServer.Spec.IngressClassName != "" {
+		spec = spec.WithIngressClassName(codeServer.Spec.IngressClassName)
+	}
+
 	ingress := networkingv1apply.Ingress(codeServer.Name, codeServer.Namespace).
 		WithLabels(map[string]string{
 			"app.kubernetes.io/name":       CodeServer,
 			"app.kubernetes.io/instance":   codeServer.Name,
 			"app.kubernetes.io/created-by": CodeServerManager,
 		}).
 		WithOwnerReferences(owner).
-		WithSpec(networkingv1apply.IngressSpec().
-			WithIngressClassName(codeServer.Spec.IngressClassName).
-			WithRules(networkingv1apply.IngressRule().
-				WithHost(host).
-				WithHTTP(networkingv1apply.HTTPIngressRuleValue().
-					WithPaths(networkingv1apply.HTTPIngressPath().
-						WithPath("/").
-						WithPathType(networkingv1.PathTypePrefix).
-						WithBackend(networkingv1apply.IngressBackend().
-							WithService(networkingv1apply.IngressServiceBackend().
-								WithName(codeServer.Name).
-								WithPort(networkingv1apply.ServiceBackendPort().
-									WithName("http"),
-								),
-							),
-						),
-					),
-				),
-			),
-		)
+		WithSpec(spec)
 
 	obj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(ingress)
 	if err != nil {