wip: fix bots

Author: lorenzocorallo

argocd-applications.yaml

@@ -42,29 +42,29 @@ applications:
     info:
       - name: url
         value: https://argoproj.github.io/
-  bot-mat:
-    name: bot-mat
-    namespace: argocd
-    project: default
-    source:
-      repoURL: https://github.com/poliNetworkOrg/polinetwork-cd
-      targetRevision: HEAD
-      path: bot-mat
-      directory:
-        recurse: true
-    destination:
-      server: https://kubernetes.default.svc
-      namespace: bot-mat
-    syncPolicy:
-      automated:
-        prune: true
-        selfHeal: true
-      syncOptions:
-        - CreateNamespace=false
-        - Replace=true
-    info:
-      - name: url
-        value: https://argoproj.github.io/
+  # bot-mat:
+  #   name: bot-mat
+  #   namespace: argocd
+  #   project: default
+  #   source:
+  #     repoURL: https://github.com/poliNetworkOrg/polinetwork-cd
+  #     targetRevision: HEAD
+  #     path: bot-mat
+  #     directory:
+  #       recurse: true
+  #   destination:
+  #     server: https://kubernetes.default.svc
+  #     namespace: bot-mat
+  #   syncPolicy:
+  #     automated:
+  #       prune: true
+  #       selfHeal: true
+  #     syncOptions:
+  #       - CreateNamespace=false
+  #       - Replace=true
+  #   info:
+  #     - name: url
+  #       value: https://argoproj.github.io/
   mariadb:
     name: mariadb
     namespace: argocd

main.tf

@@ -36,7 +36,7 @@ module "aks" {
   location = azurerm_resource_group.rg.location
   rg_name  = azurerm_resource_group.rg.name
 
-  kubernetes_orchestrator_version = "1.26.3"
+  kubernetes_orchestrator_version = "1.32.0"
 
 }
 
@@ -55,6 +55,15 @@ module "argo-cd" {
   ]
 }
 
+module "aule_bot" {
+  depends_on = [
+    module.mariadb
+  ]
+
+  source = "./modules/bots-migration/"
+  bot_namespace = "bot-rooms"
+}
+
 module "cloudflare" {
   depends_on = [
     module.aks
@@ -127,22 +136,13 @@ module "bot_mat_migration" {
     module.mariadb
   ]
 
-  source = "./modules/bots/"
+  source = "./modules/bots-migration/"
 
   bot_namespace               = "bot-mat"
-  bot_token                   = data.azurerm_key_vault_secret.prod_mat_token.value
-  bot_onMessage               = "mat"
-  db_database                 = "polinetwork_materials"
-  db_host                     = local.mariadb_internal_ip
-  db_password                 = data.azurerm_key_vault_secret.prod_mat_db_password.value
-  db_user                     = data.azurerm_key_vault_secret.prod_mat_db_user.value
   persistent_storage          = true
   persistent_storage_size_gi  = "250"
   persistent_storage_location = azurerm_resource_group.rg.location
   persistent_storage_rg_name  = azurerm_resource_group.rg.name
-
-  material_password = data.azurerm_key_vault_secret.dev_mat_config_password.value
-  material_root_dir = "/Repos/"
 }
 
 module "keyvault" {

modules/bots-migration/.terraform.lock.hcl

@@ -0,0 +1,98 @@
+resource "random_uuid" "volume" {
+}
+
+resource "kubernetes_namespace" "bot-namespace" {
+  metadata {
+    name = var.bot_namespace
+  }
+}
+
+resource "azurerm_managed_disk" "storage" {
+  count                = var.persistent_storage ? 1 : 0
+  name                 = "md-polinetwork-${random_uuid.volume.result}"
+  location             = var.persistent_storage_location
+  resource_group_name  = var.persistent_storage_rg_name
+  storage_account_type = "Standard_LRS"
+  create_option        = "Empty"
+  disk_size_gb         = var.persistent_storage_size_gi
+}
+
+resource "kubernetes_persistent_volume" "storage" {
+  count = var.persistent_storage ? 1 : 0
+
+  metadata {
+    name = "${random_uuid.volume.result}-bot-pv"
+  }
+  spec {
+    capacity = {
+      storage = "${var.persistent_storage_size_gi}Gi"
+    }
+    storage_class_name = "managed-csi"
+    access_modes       = ["ReadWriteOnce"]
+    persistent_volume_source {
+      csi {
+        driver        = "disk.csi.azure.com"
+        volume_handle = azurerm_managed_disk.storage[0].id
+      }
+    }
+  }
+
+  depends_on = [
+    azurerm_managed_disk.storage
+  ]
+}
+
+resource "kubernetes_persistent_volume_claim" "storage_pvc" {
+  count = var.persistent_storage ? 1 : 0
+  metadata {
+    name      = var.pvc_name == "" ? "bot-pvc" : var.pvc_name
+    namespace = var.bot_namespace
+  }
+  spec {
+    access_modes       = ["ReadWriteOnce"]
+    storage_class_name = "managed-csi"
+    resources {
+      requests = {
+        storage = "${var.persistent_storage_size_gi}Gi"
+      }
+    }
+    volume_name = kubernetes_persistent_volume.storage[0].metadata[0].name
+  }
+}
+
+resource "kubernetes_secret" "git_config" {
+  count = var.git_config ? 1 : 0
+  metadata {
+    name      = "git-config"
+    namespace = var.bot_namespace
+  }
+
+  data = {
+    "git_info.json" = jsonencode({
+      user        = var.git_user,
+      email       = var.git_email,
+      data_repo   = var.git_data_repo,
+      remote_repo = var.git_remote_repo,
+      path        = var.git_path
+    })
+    "ssh-key" = var.git_password
+  }
+}
+
+resource "kubernetes_secret" "git_ssh_config" {
+  count = var.git_config ? 1 : 0
+  metadata {
+    name      = "ssh-config"
+    namespace = var.bot_namespace
+  }
+
+  data = {
+    "config" = <<EOF
+Host github
+ HostName github.com
+ User git
+ IdentityFile /git/ssh-key
+ IdentitiesOnly yes
+EOF
+  }
+}

modules/bots-migration/bots.tf

@@ -0,0 +1,71 @@
+variable "bot_namespace" {
+  type     = string
+  nullable = false
+}
+
+variable "persistent_storage" {
+  type        = bool
+  description = "Volume claim for the bot"
+  default     = false
+}
+
+variable "persistent_storage_location" {
+  type    = string
+  default = ""
+}
+
+variable "persistent_storage_rg_name" {
+  type    = string
+  default = ""
+}
+
+variable "persistent_storage_size_gi" {
+  type        = string
+  description = "Requested storage"
+  default     = ""
+}
+
+variable "git_user" {
+  type      = string
+  sensitive = false
+  default   = ""
+}
+
+variable "git_email" {
+  type      = string
+  sensitive = true
+  default   = ""
+}
+variable "git_password" {
+  type      = string
+  sensitive = true
+  default   = ""
+}
+variable "git_data_repo" {
+  type      = string
+  sensitive = false
+  default   = ""
+}
+variable "git_remote_repo" {
+  type      = string
+  sensitive = false
+  default   = ""
+}
+
+variable "git_path" {
+  type      = string
+  sensitive = false
+  default   = "/Repos"
+}
+
+variable "git_config" {
+  type      = bool
+  sensitive = false
+  default   = false
+}
+
+variable "pvc_name" {
+  type      = string
+  sensitive = false
+  default   = ""
+}

modules/bots-migration/variables.tf

@@ -0,0 +1,17 @@
+terraform {
+  required_version = "~> 1.0"
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "3.63.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.5.1"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = "2.21.1"
+    }
+  }
+}

modules/bots-migration/versions.tf

@@ -136,4 +136,4 @@ Host github
  IdentitiesOnly yes
 EOF
   }
-}
+}