Merge branch 'k8s-setup' of github.com:Go-phie/infras-setup into k8s-…

…setup
bisohns · Apr 25, 2023 · 65a88db · 65a88db
2 parents 4883fe1 + e5a5afd
commit 65a88db
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 134 deletions.
diff --git a/k8s/helmfile.yaml b/k8s/helmfile.yaml
@@ -12,10 +12,18 @@ releases:
     createNamespace: true
     chart: ingress-nginx/ingress-nginx
     version: 4.6.0
+    labels:
+      app: ingress-nginx
     values:
       - controller:
           ingressClassResource:
             default: true
+          service:
+            externalTrafficPolicy: Local
+          config:
+            http-snippet: |-
+                proxy_cache_path /tmp/cache levels=1:2 keys_zone=app_cache:50m max_size=1g inactive=1d use_temp_path=off;
+
 
   - name: cert-manager
     namespace: cert-manager
@@ -24,5 +32,6 @@ releases:
     version: 1.11.1
     values:
     - installCRDs: true
-
+    labels:
+      app: cert-manager
 
diff --git a/terraform/gcp/database.tf b/terraform/gcp/database.tf
@@ -0,0 +1,9 @@
+resource "google_sql_database_instance" "main" {
+  name             = "khidom-01"
+  database_version = "POSTGRES_14"
+  region           = "us-west1"
+
+  settings {
+    tier = "db-f1-micro"
+  }
+}
diff --git a/terraform/mythra/.terraform.lock.hcl b/terraform/mythra/.terraform.lock.hcl
diff --git a/terraform/mythra/backend.tf b/terraform/mythra/backend.tf
diff --git a/terraform/mythra/data.tf b/terraform/mythra/data.tf
diff --git a/terraform/mythra/main.tf b/terraform/mythra/main.tf
diff --git a/terraform/mythra/output.tf b/terraform/mythra/output.tf
diff --git a/terraform/mythra/providers.tf b/terraform/mythra/providers.tf
diff --git a/terraform/mythra/variables.tf b/terraform/mythra/variables.tf