Replaced Nginx Ingress Controller with NodePort Service

internal/controller/devcontainerapp_controller.go

@@ -31,7 +31,6 @@ import (
 	devcontainer_controller_utils "devstar.cn/DevcontainerApp/internal/controller/utils"
 	app_v1 "k8s.io/api/apps/v1"
 	core_v1 "k8s.io/api/core/v1"
-	networking_v1 "k8s.io/api/networking/v1"
 	k8s_sigs_controller_runtime_utils "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
@@ -56,9 +55,6 @@ type DevcontainerAppReconciler struct {
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/reconcile
 func (r *DevcontainerAppReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
-
-	logger.Info("[Reconciler] ENTER controller.Reconcile(...)")
-
 	var err error
 
 	// 1. 读取缓存中的 app
@@ -117,26 +113,6 @@ func (r *DevcontainerAppReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}
 	}
 
-	// 2.3 Ingress 处理
-	ingress := devcontainer_controller_utils.NewIngress(app)
-	err = k8s_sigs_controller_runtime_utils.SetControllerReference(app, ingress, r.Scheme)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-	ingressInNamespace := &networking_v1.Ingress{}
-	err = r.Get(ctx, types.NamespacedName{Name: app.Name, Namespace: app.Namespace}, ingressInNamespace)
-	if err != nil {
-		if !errors.IsNotFound(err) {
-			return ctrl.Result{}, err
-		}
-		err := r.Create(ctx, ingress)
-		if err != nil && !errors.IsAlreadyExists(err) {
-			logger.Error(err, "failed to create ingress")
-			return ctrl.Result{}, err
-		}
-	}
-
-	logger.Info("[Reconciler] LEAVE controller.Reconcile(...)")
 	return ctrl.Result{}, nil
 }
 
@@ -146,6 +122,5 @@ func (r *DevcontainerAppReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&devcontainer_v1.DevcontainerApp{}).
 		Owns(&app_v1.StatefulSet{}).
 		Owns(&core_v1.Service{}).
-		Owns(&networking_v1.Ingress{}).
 		Complete(r)
 }

internal/controller/templates/ingress.yaml

@@ -1,20 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: nginx-{{.ObjectMeta.Name}}-ingress
-  namespace: {{.ObjectMeta.Namespace}}
-spec:
-  ingressClassName: nginx
-  # TODO: create port-forwarding rule for SSH
-  # - https://kubernetes.github.io/ingress-nginx/user-guide/exposing-tcp-udp-services/
-  rules:
-    - host: {{.ObjectMeta.Name}}.devcontainer.devstar.cn
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: {{.ObjectMeta.Name}}-svc
-                port:
-                  number: {{.Spec.Ingress.Port}}

internal/controller/templates/service.yaml

@@ -6,8 +6,18 @@ metadata:
 spec:
   selector:
     app: {{.ObjectMeta.Name}}
+  sessionAffinity: None
+  type: NodePort
+  externalTrafficPolicy: Cluster
+  internalTrafficPolicy: Cluster
+  ipFamilyPolicy: SingleStack
+  ipFamilies:
+  - IPv4
   ports:
-    - name: ssh
-      port: {{.Spec.Ingress.Port}}
-      targetPort: ssh-port
-      protocol: TCP
+  - name: ssh-port
+    protocol: TCP
+    port: 22
+    targetPort: {{.Spec.StatefulSet.ContainerPort}}
+    {{ if .Spec.Service.NodePort}}
+    nodePort: {{.Spec.Service.NodePort}}
+    {{ end }}

internal/controller/templates/statefulset.yaml

@@ -19,11 +19,18 @@ spec:
       containers:
         - name: {{.ObjectMeta.Name}}
           image: {{.Spec.StatefulSet.Image}}
+          command:
+          {{range .Spec.StatefulSet.Command}}
+          - {{.}}
+          {{end}}
           imagePullPolicy: IfNotPresent
           ports:
             - name: ssh-port
               protocol: TCP
-              containerPort: {{.Spec.Service.ContainerPort}}
+              containerPort: {{.Spec.StatefulSet.ContainerPort}}
+          volumeMounts:
+          - name: pvc-devcontainer
+            mountPath: /data
           livenessProbe:
             exec:
               command:
@@ -37,9 +44,9 @@ spec:
             timeoutSeconds: 5
           resources:
             limits:
-              cpu: 150m
-              ephemeral-storage: 2Gi
-              memory: 192Mi
+              cpu: 300m
+              ephemeral-storage: 8Gi
+              memory: 512Mi
             requests:
               cpu: 100m
               ephemeral-storage: 50Mi
@@ -48,12 +55,11 @@ spec:
     - apiVersion: v1
       kind: PersistentVolumeClaim
       metadata:
-        name: devstar-devcontainer-pvc
+        name: pvc-devcontainer
       spec:
+        storageClassName: openebs-hostpath
         accessModes:
         - ReadWriteOnce
         resources:
           requests:
-            storage: 8Gi
-        storageClassName: local
-        volumeMode: Filesystem
+            storage: 10Gi

internal/controller/utils/template_utils.go

@@ -7,13 +7,19 @@ import (
 	devcontainer_apps_v1 "devstar.cn/DevcontainerApp/api/v1"
 	app_v1 "k8s.io/api/apps/v1"
 	core_v1 "k8s.io/api/core/v1"
-	networking_v1 "k8s.io/api/networking/v1"
 	yaml_util "k8s.io/apimachinery/pkg/util/yaml"
 )
 
+const (
+	TemplatePath = "internal/controller/templates/"
+)
+
 // parseTemplate 解析 Go Template 模板文件
 func parseTemplate(templateName string, app *devcontainer_apps_v1.DevcontainerApp) []byte {
-	tmpl, err := template.ParseFiles("internal/controller/templates/" + templateName + ".yaml")
+	tmpl, err := template.
+		New(templateName + ".yaml").
+		Funcs(template.FuncMap{"default": DefaultFunc}).
+		ParseFiles(TemplatePath + templateName + ".yaml")
 	if err != nil {
 		panic(err)
 	}
@@ -25,7 +31,7 @@ func parseTemplate(templateName string, app *devcontainer_apps_v1.DevcontainerAp
 	return b.Bytes()
 }
 
-// NewStatefulSet 根据创建 StatefulSet
+// NewStatefulSet 创建 StatefulSet
 func NewStatefulSet(app *devcontainer_apps_v1.DevcontainerApp) *app_v1.StatefulSet {
 	statefulSet := &app_v1.StatefulSet{}
 	err := yaml_util.Unmarshal(parseTemplate("statefulset", app), statefulSet)
@@ -45,12 +51,10 @@ func NewService(app *devcontainer_apps_v1.DevcontainerApp) *core_v1.Service {
 	return service
 }
 
-// NewIngress 创建新的 Ingress Controller 规则
-func NewIngress(app *devcontainer_apps_v1.DevcontainerApp) *networking_v1.Ingress {
-	ingress := &networking_v1.Ingress{}
-	err := yaml_util.Unmarshal(parseTemplate("ingress", app), ingress)
-	if err != nil {
-		panic(err)
+// DefaultFunc 函数用于实现默认值
+func DefaultFunc(value interface{}, defaultValue interface{}) interface{} {
+	if value == nil || value == "" {
+		return defaultValue
 	}
-	return ingress
+	return value
 }