Initial config

main.tf

@@ -250,12 +250,6 @@ server:
     hostname: prometheus.${var.domain_suffix}
   service:
     type: ClusterIP
-  extraScrapeConfigs:
-  - job_name: pushgateway
-    scrape_interval: 300s
-    honor_labels: true
-    static_configs:
-      - targets: ['${helm_release.prometheus_pushgw.name}-${helm_release.prometheus_pushgw.chart}.${helm_release.prometheus_pushgw.namespace}.svc.cluster.local:9091']
 alertmanager:
   service:
     type: ClusterIP
@@ -263,29 +257,6 @@ EOT
   ]
 }
 
-resource "helm_release" "prometheus_pushgw" {
-  name = "prometheus-pushgw"
-  namespace = var.prometheus_namespace
-  repository = "https://prometheus-community.github.io/helm-charts"
-  chart = "prometheus-pushgateway"
-  create_namespace = true
-  values = [
-<<EOT
-ingress:
-  enabled: true
-  hosts:
-  - pushgw.${var.domain_suffix}
-  tls:
-  - secretName: pushgw-tls
-    hosts:
-    - pushgw.${var.domain_suffix}
-persistentVolume:
-  enabled: true
-  storageClass: ${var.storageclass}
-EOT
-  ]
-}
-
 resource "helm_release" "influxdb" {
   name = "influxdb"
   namespace = var.influxdb_namespace
@@ -378,7 +349,7 @@ resource "helm_release" "grafana" {
           url: http://influxdb.${var.influxdb_namespace}.svc.cluster.local:8006
         - name: Prometheus
           type: prometheus
-          url: http://prometheus-server.${var.prometheus_namespace}.svc.cluster.local
+          url: http://prometheus.${var.prometheus_namespace}.svc.cluster.local
     global:
       storageClass: ${var.storageclass}
     ingress:
@@ -426,6 +397,38 @@ EOT
   ]
 }
 
+resource "helm_release" "container-registry" {
+  name = "container-registry"
+  namespace = "zot"
+  repository = "https://zotregistry.io/helm-charts/"
+  chart = "zot"
+  create_namespace = true
+  values = [
+<<EOT
+ingress:
+  enabled: true
+  annotations:
+    traefik.ingress.kubernetes.io/router.middlewares: default-redirect-https@kubernetescrd
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+  hosts:
+  - host: registry.${var.domain_suffix}
+    paths:
+  - path: /
+    pathType: Prefix
+  tls:
+  - hosts:
+    - registry.${var.domain_suffix}
+      secretName: tls-gitea
+  className: "traefik"
+httpGet:
+  scheme: HTTP
+persistence: true
+pvc:
+  storageClassName: ${var.storageclass}
+EOT
+  ]
+}
+
 resource "random_integer" "proxmox_node" {
   min=1
   max=2

vars.tf

@@ -70,7 +70,7 @@ variable "proxmox_host_prefix" {
 }
 
 variable "num_routers" {
-    default = "0"
+    default = "3"
 }
 
 variable "template_name" {