Version updates (#24)

* Version updates

* Cleanup

* Rewrite adguard as docker_container

* Adjustments

k8s/httpbin/deployment.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: httpbin
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: httpbin
+      version: v1
+  template:
+    metadata:
+      labels:
+        app: httpbin
+        version: v1
+    spec:
+      containers:
+        - image: docker.io/kennethreitz/httpbin
+          imagePullPolicy: IfNotPresent
+          name: httpbin
+          ports:
+            - containerPort: 80

k8s/httpbin/ingress.yaml

@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: httpbin
+  annotations:
+    kubernetes.io/ingress.class: public
+spec:
+  rules:
+    - host: home.io
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: httpbin
+                port:
+                  number: 80

k8s/httpbin/manifest.yaml

@@ -0,0 +1,38 @@
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: doks-example
+spec:
+  type: LoadBalancer
+#  externalIPs:
+#    - 192.168.29.242
+  selector:
+    app: doks-example
+  ports:
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: 80
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: doks-example
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: doks-example
+  template:
+    metadata:
+      labels:
+        app: doks-example
+    spec:
+      containers:
+        - name: nginx
+          image: digitalocean/doks-example
+          imagePullPolicy: "Always"
+          ports:
+            - containerPort: 80
+              protocol: TCP

k8s/httpbin/service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: httpbin
+spec:
+  type: LoadBalancer
+  selector:
+    app: httpbin
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8900

src/live/_local/storage-appdata/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../../modules/local-mount"
+  source = "../../..//modules/local-mount"
 }
 
 include {

src/live/_local/storage-compose/terragrunt.hcl

@@ -0,0 +1,17 @@
+locals {
+  environment_vars = read_terragrunt_config(find_in_parent_folders("mounts.hcl"))
+  env              = local.environment_vars.locals
+}
+
+terraform {
+  source = "../../..//modules/local-mount"
+}
+
+include {
+  path = find_in_parent_folders()
+}
+
+inputs = {
+  name       = "mount-compose"
+  mountpoint = local.env.compose_path
+}

src/live/_local/storage-downloads/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../../modules/local-mount"
+  source = "../../..//modules/local-mount"
 }
 
 include {

src/live/_local/storage-root/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../../modules/local-mount"
+  source = "../../..//modules/local-mount"
 }
 
 include {

src/live/_local/storage-torrents-blackhole/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../../modules/local-mount"
+  source = "../../..//modules/local-mount"
 }
 
 include {

src/live/adguard-exporter/terragrunt.hcl

@@ -0,0 +1,19 @@
+locals {
+  environment_vars = read_terragrunt_config(find_in_parent_folders("env.hcl"))
+  env              = local.environment_vars.locals.adguard-exporter
+}
+
+terraform {
+  source = "../..//modules/adguard-exporter"
+}
+
+include {
+  path = find_in_parent_folders()
+}
+
+inputs = merge(local.env, {
+  adguard_hostname = "172.17.0.1"
+  adguard_username = "admin"
+//  adguard_password = ""
+  adguard_port = local.environment_vars.locals.adguard.port
+})

src/live/adguard/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../modules/adguard"
+  source = "../..//modules/adguard"
 }
 
 include {

src/live/code-server/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../modules/code-server"
+  source = "../..//modules/code-server"
 }
 
 dependency "appdata_storage" {
@@ -16,12 +16,22 @@ dependency "appdata_storage" {
   }
 }
 
+dependency "compose_storage" {
+  config_path = "../_local/storage-compose"
+
+  mock_outputs_allowed_terraform_commands = ["validate", "plan"]
+  mock_outputs                            = {
+    volume = "mock-compose-storage"
+  }
+}
+
 include {
   path = find_in_parent_folders()
 }
 
 inputs = merge(local.env, {
   mounts = {
-    (dependency.appdata_storage.outputs.volume) = "/appdata"
+    (dependency.appdata_storage.outputs.volume) = "/appdata",
+    (dependency.compose_storage.outputs.volume) = "/compose"
   }
 })

src/live/dozzle/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../modules/dozzle"
+  source = "../..//modules/dozzle"
 }
 
 include {

src/live/env.hcl

@@ -7,7 +7,7 @@ locals {
   }
 
   httpbin = {
-    port = 9009
+    port = 8185
   }
 
   dozzle = {
@@ -46,6 +46,10 @@ locals {
     data_path   = "/appdata/adguard/work"
   }
 
+  adguard-exporter = {
+    port = 9617
+  }
+
   sonarr = {
     port        = 8989
     config_path = "/appdata/sonarr"

src/live/grafana/terragrunt.hcl

@@ -4,11 +4,21 @@ locals {
 }
 
 terraform {
-  source = "../../modules/grafana"
+  source = "../..//modules/grafana"
 }
 
 include {
   path = find_in_parent_folders()
 }
 
-inputs = local.env
+inputs = merge(local.env, {
+  plugins = join(",", [
+    "grafana-strava-datasource",
+    "grafana-worldmap-panel",
+    "grafana-piechart-panel",
+    "grafana-googlesheets-datasource"
+  ])
+  env     = {
+    GF_STRAVA_DS_DATA_PATH = "/var/lib/grafana/strava"
+  }
+})

src/live/httpbin/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../modules/httpbin"
+  source = "../..//modules/httpbin"
 }
 
 include {

src/live/jackett/terragrunt.hcl

@@ -4,7 +4,7 @@ locals {
 }
 
 terraform {
-  source = "../../modules/jackett"
+  source = "../..//modules/jackett"
 }
 
 dependency "torrents_storage" {

src/live/mounts.hcl

@@ -2,5 +2,6 @@ locals {
   torrents_path  = "/storage/downloads/torrents"
   downloads_path = "/storage/downloads"
   appdata_path   = "/appdata"
+  compose_path   = "/home/kira/compose"
   storage_path   = "/storage"
 }

src/live/network-torrents/terragrunt.hcl

@@ -1,5 +1,5 @@
 terraform {
-  source = "../../modules/network"
+  source = "../..//modules/network"
 }
 
 include {