Merge pull request #26 from spapa013/spapadop/plt-862-fix-namespace-usage-in-rendered-manifest-files

spapadop/plt-862-fix-namespace-usage-in-rendered-manifest-files

Author: spapa013

internal/templates/renderer_test.go

@@ -26,6 +26,7 @@ func TestRenderTemplate(t *testing.T) {
 			},
 			UID:   2000,
 			Image: "ubuntu:22.04",
+			Namespace: "devenv-test",
 			Packages: config.PackageConfig{
 				Python: []string{"numpy", "pandas"},
 				APT:    []string{"vim", "curl"},
@@ -57,7 +58,7 @@ func TestRenderTemplate(t *testing.T) {
 		},
 	}
 
-	templates := []string{"statefulset", "service", "env-vars", "startup-scripts"}
+	templates := []string{"statefulset", "service", "env-vars", "startup-scripts", "ingress"}
 
 	for _, templateName := range templates {
 		t.Run(templateName, func(t *testing.T) {
@@ -109,6 +110,7 @@ func TestRenderAll(t *testing.T) {
 		Name: "minimal",
 		BaseConfig: config.BaseConfig{
 			SSHPublicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7... minimal@example.com",
+			Namespace:   "devenv-test",
 		},
 		SSHPort: 30002,
 	}
@@ -121,7 +123,7 @@ func TestRenderAll(t *testing.T) {
 	require.NoError(t, err, "RenderAll should not return error")
 
 	// Verify all expected files were created
-	expectedFiles := []string{"statefulset.yaml", "service.yaml", "env-vars.yaml", "startup-scripts.yaml"}
+	expectedFiles := []string{"statefulset.yaml", "service.yaml", "env-vars.yaml", "startup-scripts.yaml", "ingress.yaml"}
 
 	for _, filename := range expectedFiles {
 		filePath := filepath.Join(tempDir, filename)

internal/templates/template_files/dev/manifests/env-vars.tmpl

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: env-vars-{{.Name}}
+  namespace: {{.Namespace}}
   labels:
     app: devenv-{{.Name}}
 data:

internal/templates/template_files/dev/manifests/ingress.tmpl

@@ -2,6 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: devenv-ingress-{{.Name}}
+  namespace: {{.Namespace}}
   annotations:
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
     cert-manager.io/cluster-issuer: "letsencrypt"
@@ -28,4 +29,4 @@ spec:
   tls:
     - hosts:
         - "*.{{.HostName}}"
-      secretName: http-{{.Name}}-tls
+      secretName: http-{{.Name}}-tls

internal/templates/template_files/dev/manifests/service.tmpl

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: devenv-ssh-{{.Name}}
+  namespace: {{.Namespace}}
   labels:
     app: devenv-{{.Name}}
     service: ssh
@@ -21,6 +22,7 @@ apiVersion: v1
 kind: Service  
 metadata:
   name: devenv-http-{{.Name}}
+  namespace: {{.Namespace}}
   labels:
     app: devenv-{{.Name}}
     service: http
@@ -33,4 +35,4 @@ spec:
     port: {{.HTTPPort}}
     targetPort: {{.HTTPPort}}
     protocol: TCP
-{{- end}}
+{{- end}}

internal/templates/template_files/dev/manifests/startup-scripts.tmpl

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: startup-scripts-{{.Name}}
+  namespace: {{.Namespace}}
   labels:
     app: devenv-{{.Name}}
 data:
@@ -19,4 +20,4 @@ data:
 
   # User setup script
   setup.sh: |
-    {{getTemplatedScript "user-setup.sh" . | indent 4}}
+    {{getTemplatedScript "user-setup.sh" . | indent 4}}

internal/templates/template_files/dev/manifests/statefulset.tmpl

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: devenv-{{.Name}}
+  namespace: {{.Namespace}}
   labels:
     app: devenv-{{.Name}}
     component: devenv
@@ -127,4 +128,4 @@ spec:
         hostPath:
           path: {{.LocalPath}}
           type: DirectoryOrCreate
-      {{- end}}
+      {{- end}}

internal/templates/testdata/golden/env-vars.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: env-vars-testuser
+  namespace: devenv-test
   labels:
     app: devenv-testuser
 data:

internal/templates/testdata/golden/ingress.yaml

@@ -0,0 +1,26 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: devenv-ingress-testuser
+  namespace: devenv-test
+  annotations:
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    cert-manager.io/cluster-issuer: "letsencrypt"
+    
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: testuser.
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: devenv-http-testuser
+                port:
+                  name: http
+  tls:
+    - hosts:
+        - "*."
+      secretName: http-testuser-tls

internal/templates/testdata/golden/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: devenv-ssh-testuser
+  namespace: devenv-test
   labels:
     app: devenv-testuser
     service: ssh
@@ -20,6 +21,7 @@ apiVersion: v1
 kind: Service  
 metadata:
   name: devenv-http-testuser
+  namespace: devenv-test
   labels:
     app: devenv-testuser
     service: http
@@ -31,4 +33,4 @@ spec:
   - name: http
     port: 8080
     targetPort: 8080
-    protocol: TCP
+    protocol: TCP

internal/templates/testdata/golden/startup-scripts.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: startup-scripts-testuser
+  namespace: devenv-test
   labels:
     app: devenv-testuser
 data:
@@ -355,4 +356,4 @@ data:
     git config --global user.name "${GIT_USER_NAME}"
     git config --global user.email "${GIT_USER_EMAIL}"
     
-    echo "User environment setup complete for testuser"
+    echo "User environment setup complete for testuser"