revert changes

Author: milldr

src/provider-github.tf

@@ -17,15 +17,38 @@ variable "github_token_override" {
   default     = null
 }
 
+# GitHub App Authentication Variables
+variable "github_app_enabled" {
+  type        = bool
+  description = "Whether to use GitHub App authentication instead of PAT"
+  default     = false
+}
+
+variable "github_app_id" {
+  type        = string
+  description = "The ID of the GitHub App to use for authentication"
+  default     = null
+}
+
+variable "github_app_installation_id" {
+  type        = string
+  description = "The Installation ID of the GitHub App to use for authentication"
+  default     = null
+}
+
+variable "ssm_github_app_private_key" {
+  type        = string
+  description = "SSM path to the GitHub App private key"
+  default     = "/argocd/github/app_private_key"
+}
+
 locals {
-  github_token = local.create_github_webhook ? (
-    var.github_app_enabled ? null : coalesce(var.github_token_override, try(data.aws_ssm_parameter.github_api_key[0].value, null))
-  ) : ""
+  github_token = var.github_app_enabled ? null : coalesce(var.github_token_override, try(data.aws_ssm_parameter.github_api_key[0].value, null))
 }
 
 # SSM Parameter for PAT Authentication
 data "aws_ssm_parameter" "github_api_key" {
-  count           = local.create_github_webhook && !var.github_app_enabled ? 1 : 0
+  count           = !var.github_app_enabled ? 1 : 0
   name            = var.ssm_github_api_key
   with_decryption = true
 }
@@ -39,9 +62,9 @@ data "aws_ssm_parameter" "github_app_private_key" {
 
 # We will only need the github provider if we are creating the GitHub webhook with github_repository_webhook.
 provider "github" {
-  base_url = local.create_github_webhook ? var.github_base_url : null
-  owner    = local.create_github_webhook ? var.github_organization : null
-  token    = local.create_github_webhook ? local.github_token : null
+  base_url = var.github_base_url
+  owner    = var.github_organization
+  token    = local.github_token
 
   dynamic "app_auth" {
     for_each = local.create_github_webhook && var.github_app_enabled ? [1] : []

src/resources/argocd-values.yaml.tpl

@@ -28,7 +28,7 @@ server:
 
   ingress:
     enabled: true
-    ingressClassName: alb-argocd-ext
+    ingressClassName: alb
     annotations:
       cert-manager.io/cluster-issuer: ${cert_issuer}
       external-dns.alpha.kubernetes.io/hostname: ${ingress_host}

src/variables-argocd.tf

@@ -225,27 +225,3 @@ variable "github_deploy_keys_enabled" {
   Alternatively, you can use a GitHub App to access this desired state repository configured with `var.github_app_enabled`, `var.github_app_id`, and `var.github_app_installation_id`.
   EOT
 }
-
-variable "github_app_enabled" {
-  type        = bool
-  description = "Whether to use GitHub App authentication for Argo CD repositories both for webhooks and syncing (depending on `var.github_deploy_keys_enabled`)"
-  default     = false
-}
-
-variable "github_app_id" {
-  type        = string
-  description = "The ID of the GitHub App to use for Argo CD repository authentication"
-  default     = null
-}
-
-variable "github_app_installation_id" {
-  type        = string
-  description = "The Installation ID of the GitHub App to use for Argo CD repository authentication"
-  default     = null
-}
-
-variable "ssm_github_app_private_key" {
-  type        = string
-  description = "SSM path to the GitHub App private key for Argo CD repository authentication"
-  default     = "/argocd/github/app_private_key"
-}