Renew homelab

jkroepke · Dec 20, 2024 · cf46c2e · cf46c2e
1 parent 70142e9
commit cf46c2e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/aks/argocd/1-bootstrap/argocd.yaml b/aks/argocd/1-bootstrap/argocd.yaml
@@ -13,7 +13,7 @@ spec:
   source:
     repoURL: https://github.com/jkroepke/homelab.git
     targetRevision: HEAD
-    path: argocd/1-bootstrap
+    path: aks/argocd/1-bootstrap
 
   # Destination cluster and namespace to deploy the application
   destination:

diff --git a/aks/terraform/infrastructure/_providers.tf b/aks/terraform/infrastructure/_providers.tf
@@ -15,3 +15,8 @@ provider "azapi" {
   tenant_id       = "9c1de352-64a4-4509-b3fc-4ef2df8db9b8"
   subscription_id = "1988b893-553c-4652-bd9b-52f089b21ead"
 }
+
+provider "azureakscommand" {
+  tenant_id       = "9c1de352-64a4-4509-b3fc-4ef2df8db9b8"
+  subscription_id = "1988b893-553c-4652-bd9b-52f089b21ead"
+}
diff --git a/aks/terraform/infrastructure/az_aks.tf b/aks/terraform/infrastructure/az_aks.tf
@@ -52,6 +52,12 @@ resource "azurerm_kubernetes_cluster" "jok" {
     #kubelet_disk_type      = "Temporary"
 
     only_critical_addons_enabled = false
+
+    upgrade_settings {
+      drain_timeout_in_minutes      = 5
+      max_surge                     = "1"
+      node_soak_duration_in_minutes = 0
+    }
   }
 
   linux_profile {
@@ -127,8 +133,6 @@ resource "azurerm_kubernetes_cluster" "jok" {
   sku_tier            = "Free"
 
   depends_on = [
-    azurerm_resource_provider_registration.encryption_at_host,
-    null_resource.ContainerService_Refresh_Register,
     azurerm_role_assignment.mi-aks-contributor,
     azurerm_role_assignment.mi-aks-mi-operator
   ]

diff --git a/aks/terraform/infrastructure/k8s-argocd.tf b/aks/terraform/infrastructure/k8s-argocd.tf
@@ -2,10 +2,12 @@ resource "azureakscommand_invoke" "argocd" {
   resource_group_name = azurerm_kubernetes_cluster.jok.resource_group_name
   name                = azurerm_kubernetes_cluster.jok.name
 
-  command = <<-EOT
-  helm install argocd argo-cd --wait --repo https://argoproj.github.io/argo-helm --create-namespace -n argocd
-  k apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml
-  EOT
+  command = <<EOT
+helm install argocd argo-cd --wait --repo https://argoproj.github.io/argo-helm --create-namespace -n argocd;
+kubectl apply -n argocd -f - <<API
+${file("${path.module}/../../argocd/1-bootstrap/argocd.yaml")}
+API
+EOT
 
   lifecycle {
     postcondition {
@@ -14,3 +16,7 @@ resource "azureakscommand_invoke" "argocd" {
     }
   }
 }
+
+output "output" {
+  value = azureakscommand_invoke.argocd.output
+}