Skip to content

Commit bfd8af2

Browse files
[EPMDEDP-13428]: chore: Remove Argo CD deployment via kubernetes_addons module
- Propose discontinuation of the `kubernetes_addons` module for Argo CD integration on the EKS cluster, favoring a more direct or alternative deployment strategy. JIRA: EPMDEDP-13428 Related: KubeRocketCI#4 Change-Id: I9209de116b01327aa982a4acf79874d8fc0cc296
1 parent 3444ea1 commit bfd8af2

File tree

6 files changed

+0
-153
lines changed

6 files changed

+0
-153
lines changed

eks/example.tfvars

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,6 @@ tags = {
5353
"BusinessUnit" = "EDP"
5454
}
5555

56-
enable_argocd = true
57-
58-
argocd_manage_add_ons = true
59-
60-
eks_addons_repo_ssh_key_secret_name = "ssh-key"
61-
62-
repo_url = "git@github.com:epam/edp-cluster-add-ons.git"
63-
64-
addons_path = "chart"
65-
6656
# OIDC Identity provider
6757
cluster_identity_providers = {
6858
keycloak = {

eks/main.tf

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -259,40 +259,6 @@ module "eks" {
259259
tags = local.tags
260260
}
261261

262-
module "kubernetes_addons" {
263-
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.32.1"
264-
265-
eks_cluster_id = module.eks.cluster_name
266-
eks_cluster_endpoint = module.eks.cluster_endpoint
267-
eks_oidc_provider = module.eks.oidc_provider
268-
eks_cluster_version = module.eks.cluster_version
269-
irsa_iam_permissions_boundary = var.role_permissions_boundary_arn
270-
271-
# ArgoCD addon docs: https://github.com/aws-ia/terraform-aws-eks-blueprints/blob/main/docs/add-ons/argocd.md
272-
# Example: https://github.com/aws-ia/terraform-aws-eks-blueprints/blob/main/examples/argocd/main.tf
273-
274-
# Enabled ArgoCD deploymend
275-
enable_argocd = var.enable_argocd
276-
argocd_manage_add_ons = var.argocd_manage_add_ons
277-
argocd_helm_config = {
278-
repository = "https://argoproj.github.io/argo-helm"
279-
values = [file("${path.module}/values/argocd-values.yaml")]
280-
version = "5.33.2"
281-
}
282-
# Specify repository for ArgoCD
283-
argocd_applications = {
284-
eks-addons = {
285-
path = var.addons_path
286-
repo_url = var.repo_url
287-
add_on_application = true
288-
ssh_key_secret_name = var.eks_addons_repo_ssh_key_secret_name
289-
insecure = false
290-
}
291-
}
292-
tags = local.tags
293-
}
294-
295-
296262
module "aws_ebs_csi_driver_irsa" {
297263
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
298264
version = "5.28.0"

eks/providers.tf

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,10 @@ terraform {
2020
source = "hashicorp/kubernetes"
2121
version = ">= 2.22.0"
2222
}
23-
helm = {
24-
source = "hashicorp/helm"
25-
version = ">= 2.10.1"
26-
}
2723
kubectl = {
2824
source = "gavinbunney/kubectl"
2925
version = ">= 1.14"
3026
}
31-
3227
}
3328
}
3429

@@ -45,14 +40,6 @@ provider "kubernetes" {
4540
token = data.aws_eks_cluster_auth.cluster.token
4641
}
4742

48-
provider "helm" {
49-
kubernetes {
50-
host = module.eks.cluster_endpoint
51-
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
52-
token = data.aws_eks_cluster_auth.cluster.token
53-
}
54-
}
55-
5643
provider "kubectl" {
5744
apply_retry_count = 10
5845
host = module.eks.cluster_endpoint

eks/template.tfvars

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,5 @@ spot_instance_types = [] # list with instance types
3030
aws_auth_users = [] # -- AWS List users
3131
tags = ""
3232

33-
enable_argocd = true
34-
35-
argocd_manage_add_ons = true
36-
37-
eks_addons_repo_ssh_key_secret_name = "<AWS_SECRET_MANAGER_KEY>" # ssh key with add-ons repository
38-
39-
repo_url = "<SSH_REPO_URL>" # repository with add-ons
40-
41-
addons_path = "<ADD_ONS_FOLDER>" # path to add-ons folder at repository
42-
4333
# OIDC Identity provider
4434
cluster_identity_providers = {}

eks/values/argocd-values.yaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

eks/variables.tf

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -142,35 +142,3 @@ variable "cluster_identity_providers" {
142142
type = any
143143
default = {}
144144
}
145-
146-
# Install argocd
147-
variable "enable_argocd" {
148-
description = "Enable or disable Argo CD"
149-
type = bool
150-
default = false
151-
}
152-
153-
# Indicates that ArgoCD is responsible for managing/deploying add-ons
154-
variable "argocd_manage_add_ons" {
155-
description = "Manage Argo CD add-ons"
156-
type = bool
157-
default = false
158-
}
159-
160-
# Private key name which using by ArgoCD to get chart
161-
variable "eks_addons_repo_ssh_key_secret_name" {
162-
description = "Name of secret with ssh key for repository with add-ons"
163-
type = string
164-
}
165-
166-
variable "repo_url" {
167-
description = "Repo URL for repository with add-ons"
168-
type = string
169-
default = "git@github.com:epam/edp-cluster-add-ons.git"
170-
}
171-
172-
variable "addons_path" {
173-
description = "Path for folder with add-ons"
174-
type = string
175-
default = "chart"
176-
}

0 commit comments

Comments
 (0)