chore: add script output

Author: matyasjay

Makefile

@@ -1,19 +1,8 @@
-# --- Git
-
 sign:
-	git add .
-	git commit -S
-
-shelf:
-	git add .
-	git commit -S
-	git push
-
-release:
-	sh scripts/package/bump.sh "$(PROJECT)"
-	git push
+	sh scripts/git/sign.sh
 
-# --- Package
+push:
+	sh scripts/git/push.sh "$(PROJECT)"
 
 info:
 	sh scripts/package/info.sh
@@ -45,8 +34,6 @@ env-encrypt:
 env-validate:
 	sh scripts/env/validate.sh "$(ENV)"
 
-# --- Frontend
-
 frontend-dev:
 	${MAKE} -C frontend dev
 
@@ -62,8 +49,6 @@ frontend-test:
 frontend-run:
 	${MAKE} -C frontend run
 
-# --- HTTP
-
 http-build:
 	${MAKE} -C http build
 

scripts/git/push.sh

@@ -0,0 +1,10 @@
+NO_FORMAT="\033[0m"
+F_BOLD="\033[1m"
+F_DIM="\033[2m"
+C_INDIANRED1="\033[38;5;203m"
+C_SEAGREEN2="\033[38;5;83m"
+C_GREY46="\033[38;5;243m"
+C_GREY62="\033[38;5;247m"
+
+sh scripts/package/bump.sh "$(PROJECT)"
+git push

scripts/git/sign.sh

@@ -0,0 +1,13 @@
+NO_FORMAT="\033[0m"
+F_BOLD="\033[1m"
+F_DIM="\033[2m"
+C_INDIANRED1="\033[38;5;203m"
+C_SEAGREEN2="\033[38;5;83m"
+C_GREY46="\033[38;5;243m"
+C_GREY62="\033[38;5;247m"
+
+echo "${F_BOLD}Commit Git working tree${NO_FORMAT}${C_GREY46}"
+
+git add .
+git commit -S && echo "${NO_FORMAT}${C_SEAGREEN2}Commit signed successfully!${NO_FORMAT}"
+

scripts/package/info.sh

@@ -20,6 +20,11 @@ echo "Change project: make bump PROJECT=my-project${NO_FORMAT}"
 echo "${F_DIM}"
 echo "Project: '$PROJECT'"
 echo "Namespace: '$PROJECT-deployment'${NO_FORMAT}"
-echo "${C_GREY46}"
-kubectl get svc -n "${PROJECT}-deployment" 
+echo "\n${F_DIM}Application services:${NO_FORMAT}\n${C_GREY46}"
+
+kubectl get svc -n "${PROJECT}-deployment"
+
+echo "\n${NO_FORMAT}${F_DIM}Database services:${NO_FORMAT}\n${C_GREY46}"
+
+kubectl get svc -n database
 echo "${NO_FORMAT}"

terraform/k8s.tf

@@ -4,6 +4,105 @@ resource "kubernetes_namespace" "app" {
   }
 }
 
+resource "kubernetes_namespace" "db" {
+  metadata {
+    name = "database"
+  }
+}
+
+resource "kubernetes_secret" "postgres" {
+  metadata {
+    name      = "postgres-secret"
+    namespace = kubernetes_namespace.db.metadata[0].name
+  }
+
+  data = {
+    POSTGRES_PASSWORD = base64encode("C77ahH3co@")
+  }
+
+  type = "Opaque"
+}
+
+resource "kubernetes_deployment" "postgres" {
+  metadata {
+    name      = "postgres"
+    namespace = kubernetes_namespace.db.metadata[0].name
+    labels = {
+      app = "postgres"
+    }
+  }
+
+  spec {
+    replicas = 1
+
+    selector {
+      match_labels = {
+        app = "postgres"
+      }
+    }
+
+    template {
+      metadata {
+        labels = {
+          app = "postgres"
+        }
+      }
+
+      spec {
+        container {
+          name  = "postgres"
+          image = "postgres:15"
+
+          port {
+            container_port = 5432
+          }
+
+          env {
+            name = "POSTGRES_PASSWORD"
+            value_from {
+              secret_key_ref {
+                name = kubernetes_secret.postgres.metadata[0].name
+                key  = "POSTGRES_PASSWORD"
+              }
+            }
+          }
+
+          volume_mount {
+            name       = "postgres-storage"
+            mount_path = "/var/lib/postgresql/data"
+          }
+        }
+
+        volume {
+          name = "postgres-storage"
+
+          empty_dir {} 
+        }
+      }
+    }
+  }
+}
+
+resource "kubernetes_service" "postgres" {
+  metadata {
+    name      = "postgres"
+    namespace = kubernetes_namespace.db.metadata[0].name
+  }
+
+  spec {
+    selector = {
+      app = "postgres"
+    }
+
+    port {
+      port        = 5432
+      target_port = 5432
+    }
+
+    type = "ClusterIP" 
+  }
+}
+
 resource "kubernetes_deployment" "instructor-frontend" {
   metadata {
     name      = "instructor-frontend"
@@ -118,3 +217,4 @@ resource "kubernetes_service" "instructor-backend" {
     type = "ClusterIP"
   }
 }
+