Refactoring

Author: adhasahar97

.github/workflows/terraform.yml

@@ -17,14 +17,14 @@ jobs:
 
     runs-on: self-hosted
     env:
-      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_DEFAULT_REGION: ap-southeast-1
-      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-      TF_VAR_cloudflare_account_id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      TF_VAR_cloudflare_tunnel_name: ${{ vars.CLOUDFLARE_TUNNEL_NAME }}
-      TF_VAR_cloudflare_api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-      TF_VAR_cloudflare_domain: ${{ vars.CLOUDFLARE_DOMAIN }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} # For Terraform AWS provider
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} # For Terraform AWS provider
+      AWS_DEFAULT_REGION: ap-southeast-1 # For Terraform AWS provider
+      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} # For Terraform Cloudflare provider
+      TF_VAR_cloudflare_account_id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} # For Cloudflare Ingress Controller helm release
+      TF_VAR_cloudflare_tunnel_name: ${{ vars.CLOUDFLARE_TUNNEL_NAME }} # For Cloudflare Ingress Controller helm release
+      TF_VAR_cloudflare_api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }} # For Cloudflare Ingress Controller helm release
+      TF_VAR_cloudflare_domain: ${{ vars.CLOUDFLARE_DOMAIN }} # For Cloudflare Ingress Controller helm release
       # TF_VAR_github_token: ${{ secrets.GH_TOKEN }}
       # TF_VAR_github_username: ${{ secrets.GH_USERNAME }}
     steps:

infrastructure/terraform/modules/helm/releases.tf

@@ -14,7 +14,7 @@ locals {
       name       = "argo-workflows"
       repository = "https://argoproj.github.io/argo-helm"
       chart      = "argo-workflows"
-      namespace  = "argocd"
+      namespace  = "argo-workflows"
       version    = "0.45.15"
       values     = {
         "hostname" = var.cloudflare_domain
@@ -54,7 +54,7 @@ locals {
       namespace  = "monitoring"
       version    = "68.2.1"
       values     = {
-        "cloudflare_domain" = var.cloudflare_domain
+        "hostname" = var.cloudflare_domain
       }
     },
     # "argo-workflow" = {

infrastructure/terraform/modules/helm/values/values-argo-workflows.yaml

@@ -3,4 +3,4 @@ server:
     enabled: true
     ingressClassName: "cloudflare-tunnel"
     hosts:
-      - k8s-homelab-argo-workflows.${hostname}
+      - argo-workflows.${hostname}

infrastructure/terraform/modules/helm/values/values-argocd.yaml

@@ -2,7 +2,7 @@ server:
   ingress:
     enabled: true
     ingressClassName: "cloudflare-tunnel"
-    hostname: k8s-homelab-argocd.${hostname}
+    hostname: argocd.${hostname}
 configs:
   params:
     server.insecure: true

infrastructure/terraform/modules/helm/values/values-kube-prometheus-stack.yaml

@@ -3,4 +3,4 @@ grafana:
     enabled: true
     ingressClassName: "cloudflare-tunnel"
     hosts: 
-      - k8s-homelab-grafana.${cloudflare_domain}
+      - grafana.${hostname}