Refactor Terraform configuration: remove ArgoCD module and related resources, streamline service definitions, and add ServiceMonitor for monitoring integration

Author: karimzakzouk

Terraform/0-versions.tf

@@ -5,17 +5,5 @@ terraform {
       source  = "hashicorp/aws"
       version = "~> 5.0"
     }
-    helm = {
-      source  = "hashicorp/helm"
-      version = "~> 2.12"
-    }
-    kubernetes = {
-      source  = "hashicorp/kubernetes"
-      version = "~> 2.25"
-    }
-    time = {
-      source  = "hashicorp/time"
-      version = "~> 0.9"
-    }
   }
 }

Terraform/1-provider.tf

@@ -3,29 +3,3 @@ provider "aws" {
   region = "us-east-1"
 }
 
-# Configure the Kubernetes Provider
-provider "kubernetes" {
-  host                   = module.eks.cluster_endpoint
-  cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
-
-  exec {
-    api_version = "client.authentication.k8s.io/v1beta1"
-    command     = "aws"
-    args        = ["eks", "get-token", "--cluster-name", module.eks.cluster_name]
-  }
-}
-
-# Configure the Helm Provider
-provider "helm" {
-  kubernetes {
-    host                   = module.eks.cluster_endpoint
-    cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
-
-    exec {
-      api_version = "client.authentication.k8s.io/v1beta1"
-      command     = "aws"
-      args        = ["eks", "get-token", "--cluster-name", module.eks.cluster_name]
-    }
-  }
-}
-

Terraform/3-main.tf

@@ -17,29 +17,3 @@ module "eks" {
   subnet_ids            = module.vpc.private_subnet_ids
   node_groups           = var.node_groups
 }
-
-module "argocd" {
-  source = "./modules/argocd"
-  
-  cluster_name   = var.cluster_name
-  namespace      = "argocd"
-  service_type   = "LoadBalancer"
-  insecure       = true
-  timeout        = 600
-  
-  applications = [
-    {
-      name                  = "solar-system"
-      namespace            = "argocd"
-      repository_url       = "https://github.com/KarimZakzouk/Graduation-Project-Devops"
-      path                 = "helm"
-      target_revision      = "HEAD"
-      destination_namespace = "default"
-      auto_sync            = true
-      self_heal            = true
-      prune                = true
-    }
-  ]
-  
-  depends_on = [module.eks]
-}

Terraform/5-outputs.tf

@@ -11,15 +11,4 @@ output "cluster_endpoint" {
 output "cluster_name" {
   description = "EKS cluster name"
   value = module.eks.cluster_name
-}
-
-# ArgoCD Outputs
-output "argocd_server_endpoint" {
-  description = "ArgoCD server endpoint"
-  value       = module.argocd.argocd_server_endpoint
-}
-
-output "argocd_admin_password_command" {
-  description = "Command to get ArgoCD admin password"
-  value       = module.argocd.get_admin_password_command
 }

Terraform/modules/argocd/applications.tf

@@ -2,10 +2,13 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-svc
+  labels:
+    app: {{ .Release.Name }}
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: 80
+    - name: http
+      port: 80
       targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
   selector:

Terraform/modules/argocd/main.tf

@@ -0,0 +1,18 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ .Release.Name }}-servicemonitor
+  namespace: monitoring
+  labels:
+    release: kube-prometheus-stack
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}
+  namespaceSelector:
+    matchNames: ["default"]
+  endpoints:
+    - port: http  
+      path: /metrics
+      interval: 5s
+      scheme: http