fix: add exceptions to the orphaned resources warning

README.adoc

@@ -310,7 +310,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v5.0.0"`
+Default: `"v5.2.0"`
 
 ==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
 
@@ -692,12 +692,12 @@ Description: Map of extra accounts that were created and their tokens.
 [cols="a,a",options="header,autowidth"]
 |===
 |Name |Version
-|[[provider_null]] <<provider_null,null>> |>= 3
 |[[provider_jwt]] <<provider_jwt,jwt>> |>= 1.1
 |[[provider_time]] <<provider_time,time>> |>= 0.9
 |[[provider_random]] <<provider_random,random>> |>= 3
 |[[provider_argocd]] <<provider_argocd,argocd>> |>= 5
 |[[provider_utils]] <<provider_utils,utils>> |>= 1.6
+|[[provider_null]] <<provider_null,null>> |>= 3
 |===
 
 = Resources
@@ -753,7 +753,7 @@ Description: Map of extra accounts that were created and their tokens.
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v5.0.0"`
+|`"v5.2.0"`
 |no
 
 |[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

bootstrap/README.adoc

@@ -122,9 +122,10 @@ Type:
 [source,hcl]
 ----
 map(object({
- destination_cluster = string
- allowed_source_repos = optional(list(string), ["*"])
- allowed_namespaces = optional(list(string), ["*"])
+ destination_cluster = string
+ allowed_source_repos = optional(list(string), ["*"])
+ allowed_namespaces = optional(list(string), ["*"])
+ orphaned_resources_warning = optional(bool, true)
  }))
 ----
 
@@ -242,9 +243,10 @@ At a minimum, you need to provide the `destination_cluster` value, so that the d
 [source]
 ----
 map(object({
- destination_cluster = string
- allowed_source_repos = optional(list(string), ["*"])
- allowed_namespaces = optional(list(string), ["*"])
+ destination_cluster = string
+ allowed_source_repos = optional(list(string), ["*"])
+ allowed_namespaces = optional(list(string), ["*"])
+ orphaned_resources_warning = optional(bool, true)
  }))
 ----
 

bootstrap/main.tf

@@ -53,7 +53,21 @@ resource "argocd_project" "devops_stack_applications" {
  }
 
  orphaned_resources {
- warn = true
+ warn = each.value.orphaned_resources_warning
+
+ # Because we are creating the Argo CD resources using Terraform, these appear as orphaned resources in the Argo CD
+ # interface, so we need to ignore them.
+ ignore {
+ group = "argoproj.io"
+ kind = "*"
+ name = "*"
+ }
+
+ # Most of the Secrets are created by the External Secrets operator, so it's best they are ignored.
+ ignore {
+ kind = "Secret"
+ name = "*"
+ }
  }
 
  cluster_resource_whitelist {

bootstrap/variables.tf

@@ -7,9 +7,10 @@ variable "argocd_projects" {
  *The first cluster in the list should always be your main cluster where the Argo CD will be deployed, and the destination cluster for that project must be `in-cluster`.* 
  EOT
  type = map(object({
- destination_cluster = string
- allowed_source_repos = optional(list(string), ["*"])
- allowed_namespaces = optional(list(string), ["*"])
+ destination_cluster = string
+ allowed_source_repos = optional(list(string), ["*"])
+ allowed_namespaces = optional(list(string), ["*"])
+ orphaned_resources_warning = optional(bool, true)
  }))
  default = {}
 

main.tf

@@ -37,6 +37,20 @@ resource "argocd_project" "this" {
 
  orphaned_resources {
  warn = true
+
+ # Because we are creating the Argo CD resources using Terraform, these appear as orphaned resources in the Argo CD
+ # interface, so we need to ignore them.
+ ignore {
+ group = "argoproj.io"
+ kind = "*"
+ name = "*"
+ }
+
+ # Most of the Secrets are created by the External Secrets operator, so it's best they are ignored.
+ ignore {
+ kind = "Secret"
+ name = "*"
+ }
  }
 
  cluster_resource_whitelist {