Upgrade argocd provider

Obmondo · Sep 2, 2024 · 20acee1 · 20acee1
1 parent 932a212
commit 20acee1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/docs/aws/kops/cluster.md b/docs/aws/kops/cluster.md
@@ -28,8 +28,8 @@
     ```sh
     cd terragrunt/kops
 
-    terragrunt run-all plan
-    terragrunt run-all apply
+    terragrunt run-all plan  --terragrunt-exclude-dir helm
+    terragrunt run-all apply --terragrunt-exclude-dir helm
     INFO[0000] The stack at /home/ashish/k8id-all/k8id/terragrunt/kops will be processed in the following order for command apply:
     Group 1
     - Module /home/ashish/k8id-all/k8id/terragrunt/kops/kops_bucket
@@ -44,13 +44,23 @@
     Group 4
     - Module /home/ashish/k8id-all/k8id/terragrunt/kops/iam
 
-    Group 5
-    - Module /home/ashish/k8id-all/k8id/terragrunt/kops/helm
-
     Are you sure you want to run 'terragrunt apply' in each folder of the stack described above? (y/n) y
     ```
 
 * Argocd Setup
+  * Make sure to export the cluster config
+
+    ```sh
+    kops export kubeconfig --name <cluster-name> --admin
+    ```
+
+  * cd to k8id/terragrunt/kops/cluster/helm
+  * Run the following command to deploy argocd
+
+    ```sh
+    terragrunt plan
+    terragrunt apply
+    ```
 
   * Arogcd `root` app Setup [docs](../../../argocd-helm-charts/argo-cd/Readme.md/#setup-root-argocd-application)
-  * Arogcd repo Setup [docs](../../../argocd-helm-charts/argo-cd/Readme.md/#add-argocd-repos)
+  * Arogcd repo Setup [docs](../../../argocd-helm-charts/argo-cd/Readme.md/#add-argocd-repos)
diff --git a/terraform/helm/providers.tf b/terraform/helm/providers.tf
@@ -2,29 +2,23 @@ terraform {
   required_providers {
     argocd = {
       source = "oboukili/argocd"
-      version = "6.0.3"
+      version = "6.1.1"
     }
     kubernetes = {
       source = "hashicorp/kubernetes"
-      version = "2.23.0"
+      version = "2.32.0"
     }
   }
 }
 
 provider "helm" {
   kubernetes {
-    host                   = var.k8s_host
-    client_certificate     = base64decode(var.k8s_client_certificate)
-    client_key             = base64decode(var.k8s_client_key)
-    cluster_ca_certificate = base64decode(var.k8s_cluster_ca_certificate)
+    config_path = "~/.kube/config"
   }
 }
 
 provider kubernetes {
-  host                   = var.k8s_host
-  client_certificate     = base64decode(var.k8s_client_certificate)
-  client_key             = base64decode(var.k8s_client_key)
-  cluster_ca_certificate = base64decode(var.k8s_cluster_ca_certificate)
+  config_path    = "~/.kube/config"
 }
 
 data "kubernetes_secret" "argocd_admin_password" {
@@ -43,9 +37,6 @@ provider "argocd" {
   port_forward_with_namespace = "argocd"
 
   kubernetes {
-    host                   = var.k8s_host
-    client_certificate     = base64decode(var.k8s_client_certificate)
-    client_key             = base64decode(var.k8s_client_key)
-    cluster_ca_certificate = base64decode(var.k8s_cluster_ca_certificate)
+    config_context = var.cluster_name
   }
-}
+}