Merge pull request #6 from bramlak/refactor/server

Refactor/server

Author: bramlak

kubernetes/deployment.yaml

@@ -18,6 +18,9 @@ spec:
       - name: server
         image: bramlak/origoss-task-server:latest
         imagePullPolicy: Always
+        env:
+        - name: PORT
+          value: "8080"
         ports:
         - containerPort: 8080
         resources:
@@ -30,13 +33,8 @@ spec:
 
         livenessProbe:
           httpGet:
-            path: /
+            path: /healthz
             port: 8080
           initialDelaySeconds: 10
           periodSeconds: 10
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 8080
-          initialDelaySeconds: 5
-          periodSeconds: 5
+          

minikube-infra/deployment.tf

@@ -28,6 +28,10 @@ resource "kubernetes_deployment" "origoss_task_server" {
           image = var.image
           name  = "server"
           image_pull_policy = "Always"
+          env {
+            name  = "PORT"
+            value = "8080"
+          }
 
           port {
             container_port = 8080
@@ -46,21 +50,12 @@ resource "kubernetes_deployment" "origoss_task_server" {
 
           liveness_probe {
             http_get {
-              path = "/"
+              path = "/healthz"
               port = 8080
             }
             initial_delay_seconds = 10
             period_seconds        = 10
           }
-
-          readiness_probe {
-            http_get {
-              path = "/"
-              port = 8080
-            }
-            initial_delay_seconds = 5
-            period_seconds        = 5
-          }
         }
       }
     }

server/.env.example

@@ -1,5 +1,3 @@
 module server
 
 go 1.25.4
-
-require github.com/joho/godotenv v1.5.1

server/go.mod

@@ -1,2 +0,0 @@
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=

server/go.sum

@@ -5,7 +5,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"github.com/joho/godotenv"
 	"log"
 )
 
@@ -15,25 +14,25 @@ func getRoot(w http.ResponseWriter, r *http.Request) {
 	io.WriteString(w, message)
 }
 
-func loadPortFromEnvFile() string {
-		err := godotenv.Load()
-		port := ""
-    if err != nil {
-    	log.Println("Error loading .env file: ", err)
-		} else {
-			port = os.Getenv("PORT")
-		}
-		if port == ""{
-			port = "8080"
-			log.Println("Using default port 8080")
-		}
+func getHealth(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	log.Println("Health check requested")
+}
+
 
-	return port
+func loadPort() string {
+    port := os.Getenv("PORT")
+    if port == "" {
+        port = "8080"
+        log.Println("Using default port 8080")
+    }
+    return port
 }
 
 func main() {
-	var port string = loadPortFromEnvFile();
+	var port string = loadPort();
 	http.HandleFunc("/", getRoot)
+	http.HandleFunc("/healthz", getHealth)
 	address := net.JoinHostPort("", port)
 	log.Println("Server is running on port", port)
 	http.ListenAndServe(address, nil)