Skip to content

Commit 831808e

Browse files
csantanaprcsantanapr
authored
V2 update (#28)
* update hello-world example Signed-off-by: Carlos Santana <[email protected]> * remove reference to kubectl provider Signed-off-by: Carlos Santana <[email protected]> * update ingress example Signed-off-by: Carlos Santana <[email protected]> * update secrets-manager example Signed-off-by: Carlos Santana <[email protected]> * update complete example Signed-off-by: Carlos Santana <[email protected]> * add crossplane Signed-off-by: Carlos Santana <[email protected]> * update external secrets private-git Signed-off-by: Carlos Santana <[email protected]> * add distirbuted Signed-off-by: Carlos Santana <[email protected]> * add multicluster Signed-off-by: Carlos Santana <[email protected]> * multicluster Signed-off-by: Carlos Santana <[email protected]> --------- Signed-off-by: Carlos Santana <[email protected]>
1 parent 1afe224 commit 831808e

File tree

50 files changed

+436
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+436
-560
lines changed

Diff for: ‎argocd/iac/terraform/examples/eks/argocd-ingress/bootstrap/addons.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: argoproj.io/v1alpha1
32
kind: ApplicationSet
43
metadata:

Diff for: ‎argocd/iac/terraform/examples/eks/argocd-ingress/main.tf

+9-29
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@ provider "helm" {
1818
}
1919
}
2020

21-
provider "kubectl" {
22-
host = module.eks.cluster_endpoint
23-
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
24-
exec {
25-
api_version = "client.authentication.k8s.io/v1beta1"
26-
args = ["eks", "get-token", "--cluster-name", module.eks.cluster_name, "--region", local.region]
27-
command = "aws"
28-
}
29-
load_config_file = false
30-
apply_retry_count = 15
31-
}
32-
3321
provider "kubernetes" {
3422
host = module.eks.cluster_endpoint
3523
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
@@ -121,7 +109,7 @@ locals {
121109
}
122110
)
123111

124-
argocd_bootstrap_app_of_apps = {
112+
argocd_apps = {
125113
addons = file("${path.module}/bootstrap/addons.yaml")
126114
workloads = file("${path.module}/bootstrap/workloads.yaml")
127115
}
@@ -135,29 +123,21 @@ locals {
135123
}
136124
}
137125

138-
################################################################################
139-
# GitOps Bridge: Metadata
140-
################################################################################
141-
module "gitops_bridge_metadata" {
142-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
143-
144-
cluster_name = module.eks.cluster_name
145-
environment = local.environment
146-
metadata = local.addons_metadata
147-
addons = local.addons
148-
}
149-
150126
################################################################################
151127
# GitOps Bridge: Bootstrap
152128
################################################################################
153129
module "gitops_bridge_bootstrap" {
154-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
130+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v2.0.0"
155131

156-
argocd_cluster = module.gitops_bridge_metadata.argocd
157-
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
132+
cluster = {
133+
cluster_name = module.eks.cluster_name
134+
environment = local.environment
135+
metadata = local.addons_metadata
136+
addons = local.addons
137+
}
138+
apps = local.argocd_apps
158139
}
159140

160-
161141
################################################################################
162142
# EKS Blueprints Addons
163143
################################################################################

Diff for: ‎argocd/iac/terraform/examples/eks/argocd-ingress/versions.tf

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ terraform {
1010
source = "hashicorp/helm"
1111
version = ">= 2.10.1"
1212
}
13-
kubectl = {
14-
source = "gavinbunney/kubectl"
15-
version = ">= 1.14"
16-
}
1713
kubernetes = {
1814
source = "hashicorp/kubernetes"
1915
version = "2.22.0"

Diff for: ‎argocd/iac/terraform/examples/eks/aws-secrets-manager/bootstrap/addons.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: argoproj.io/v1alpha1
32
kind: ApplicationSet
43
metadata:

Diff for: ‎argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf

+9-28
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,6 @@ provider "helm" {
2020
}
2121
}
2222

23-
provider "kubectl" {
24-
host = module.eks.cluster_endpoint
25-
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
26-
exec {
27-
api_version = "client.authentication.k8s.io/v1beta1"
28-
args = ["eks", "get-token", "--cluster-name", module.eks.cluster_name, "--region", local.region]
29-
command = "aws"
30-
}
31-
load_config_file = false
32-
apply_retry_count = 15
33-
}
34-
3523
provider "kubernetes" {
3624
host = module.eks.cluster_endpoint
3725
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
@@ -108,7 +96,7 @@ locals {
10896
}
10997
)
11098

111-
argocd_bootstrap_app_of_apps = {
99+
argocd_apps = {
112100
addons = file("${path.module}/bootstrap/addons.yaml")
113101
workloads = file("${path.module}/bootstrap/workloads.yaml")
114102
}
@@ -122,26 +110,19 @@ locals {
122110
}
123111
}
124112

125-
################################################################################
126-
# GitOps Bridge: Metadata
127-
################################################################################
128-
module "gitops_bridge_metadata" {
129-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
130-
131-
cluster_name = module.eks.cluster_name
132-
environment = local.environment
133-
metadata = local.addons_metadata
134-
addons = local.addons
135-
}
136-
137113
################################################################################
138114
# GitOps Bridge: Bootstrap
139115
################################################################################
140116
module "gitops_bridge_bootstrap" {
141-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
117+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v2.0.0"
142118

143-
argocd_cluster = module.gitops_bridge_metadata.argocd
144-
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
119+
cluster = {
120+
cluster_name = module.eks.cluster_name
121+
environment = local.environment
122+
metadata = local.addons_metadata
123+
addons = local.addons
124+
}
125+
apps = local.argocd_apps
145126
# This example shows how to set default ArgoCD Admin Password using SecretsManager with Helm Chart set_sensitive values.
146127
argocd = {
147128
set_sensitive = [

Diff for: ‎argocd/iac/terraform/examples/eks/aws-secrets-manager/versions.tf

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ terraform {
1010
source = "hashicorp/helm"
1111
version = ">= 2.10.1"
1212
}
13-
kubectl = {
14-
source = "gavinbunney/kubectl"
15-
version = ">= 1.14"
16-
}
1713
kubernetes = {
1814
source = "hashicorp/kubernetes"
1915
version = "2.22.0"

Diff for: ‎argocd/iac/terraform/examples/eks/complete/bootstrap/addons.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: argoproj.io/v1alpha1
32
kind: ApplicationSet
43
metadata:

Diff for: ‎argocd/iac/terraform/examples/eks/complete/main.tf

+29-51
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@ provider "helm" {
1818
}
1919
}
2020

21-
provider "kubectl" {
22-
host = module.eks.cluster_endpoint
23-
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
24-
exec {
25-
api_version = "client.authentication.k8s.io/v1beta1"
26-
args = ["eks", "get-token", "--cluster-name", module.eks.cluster_name, "--region", local.region]
27-
command = "aws"
28-
}
29-
load_config_file = false
30-
apply_retry_count = 15
31-
}
32-
3321
provider "kubernetes" {
3422
host = module.eks.cluster_endpoint
3523
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
@@ -111,7 +99,7 @@ locals {
11199
velero_backup_s3_bucket_name = try(local.velero_backup_s3_bucket_name, "") } : {} # Required when enabling addon velero
112100
)
113101

114-
argocd_bootstrap_app_of_apps = {
102+
argocd_apps = {
115103
addons = file("${path.module}/bootstrap/addons.yaml")
116104
workloads = file("${path.module}/bootstrap/workloads.yaml")
117105
}
@@ -129,26 +117,19 @@ locals {
129117
velero_backup_s3_bucket_prefix = "backups"
130118
}
131119

132-
################################################################################
133-
# GitOps Bridge: Metadata
134-
################################################################################
135-
module "gitops_bridge_metadata" {
136-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
137-
138-
cluster_name = module.eks.cluster_name
139-
environment = local.environment
140-
metadata = local.addons_metadata
141-
addons = local.addons
142-
}
143-
144120
################################################################################
145121
# GitOps Bridge: Bootstrap
146122
################################################################################
147123
module "gitops_bridge_bootstrap" {
148-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
124+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v2.0.0"
149125

150-
argocd_cluster = module.gitops_bridge_metadata.argocd
151-
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
126+
cluster = {
127+
cluster_name = module.eks.cluster_name
128+
environment = local.environment
129+
metadata = local.addons_metadata
130+
addons = local.addons
131+
}
132+
apps = local.argocd_apps
152133
}
153134

154135

@@ -198,29 +179,6 @@ module "eks_blueprints_addons" {
198179
s3_backup_location = "${try(module.velero_backup_s3_bucket.s3_bucket_arn, "")}/${local.velero_backup_s3_bucket_prefix}"
199180
}
200181

201-
eks_addons = {
202-
aws-ebs-csi-driver = {
203-
most_recent = true
204-
service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
205-
}
206-
coredns = {
207-
most_recent = true
208-
209-
timeouts = {
210-
create = "25m"
211-
delete = "10m"
212-
}
213-
}
214-
kube-proxy = {}
215-
/* adot needs to be installed after cert-manager is installed with gitops, uncomment once cluster addons are deployed
216-
adot = {
217-
most_recent = true
218-
service_account_role_arn = module.adot_irsa.iam_role_arn
219-
}
220-
*/
221-
aws-guardduty-agent = {}
222-
}
223-
224182
tags = local.tags
225183
}
226184

@@ -285,6 +243,26 @@ module "eks" {
285243
}
286244
})
287245
}
246+
aws-ebs-csi-driver = {
247+
most_recent = true
248+
service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
249+
}
250+
coredns = {
251+
most_recent = true
252+
253+
timeouts = {
254+
create = "25m"
255+
delete = "10m"
256+
}
257+
}
258+
kube-proxy = {}
259+
/* adot needs to be installed after cert-manager is installed with gitops, uncomment once cluster addons are deployed
260+
adot = {
261+
most_recent = true
262+
service_account_role_arn = module.adot_irsa.iam_role_arn
263+
}
264+
*/
265+
aws-guardduty-agent = {}
288266
}
289267
tags = local.tags
290268
}

Diff for: ‎argocd/iac/terraform/examples/eks/complete/variables.tf

+5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
variable "gitops_addons_org" {
22
description = "Git repository org/user contains for addons"
3+
type = string
34
default = "https://github.com/gitops-bridge-dev"
45
}
56
variable "gitops_addons_repo" {
67
description = "Git repository contains for addons"
8+
type = string
79
default = "gitops-bridge-argocd-control-plane-template"
810
}
911
variable "gitops_addons_basepath" {
1012
description = "Git repository base path for addons"
13+
type = string
1114
default = ""
1215
}
1316
variable "gitops_addons_path" {
1417
description = "Git repository path for addons"
18+
type = string
1519
default = "bootstrap/control-plane/addons"
1620
}
1721
variable "gitops_addons_revision" {
1822
description = "Git repository revision/branch/ref for addons"
23+
type = string
1924
default = "HEAD"
2025
}

Diff for: ‎argocd/iac/terraform/examples/eks/complete/versions.tf

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ terraform {
1010
source = "hashicorp/helm"
1111
version = ">= 2.10.1"
1212
}
13-
kubectl = {
14-
source = "gavinbunney/kubectl"
15-
version = ">= 1.14"
16-
}
1713
kubernetes = {
1814
source = "hashicorp/kubernetes"
1915
version = "2.22.0"

Diff for: ‎argocd/iac/terraform/examples/eks/crossplane/bootstrap/addons.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
apiVersion: argoproj.io/v1alpha1
32
kind: ApplicationSet
43
metadata:

Diff for: ‎argocd/iac/terraform/examples/eks/crossplane/main.tf

+10-29
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@ provider "helm" {
1818
}
1919
}
2020

21-
provider "kubectl" {
22-
host = module.eks.cluster_endpoint
23-
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
24-
exec {
25-
api_version = "client.authentication.k8s.io/v1beta1"
26-
args = ["eks", "get-token", "--cluster-name", module.eks.cluster_name, "--region", local.region]
27-
command = "aws"
28-
}
29-
load_config_file = false
30-
apply_retry_count = 15
31-
}
32-
3321
provider "kubernetes" {
3422
host = module.eks.cluster_endpoint
3523
cluster_ca_certificate = base64decode(module.eks.cluster_certificate_authority_data)
@@ -115,7 +103,7 @@ locals {
115103
}
116104
)
117105

118-
argocd_bootstrap_app_of_apps = {
106+
argocd_apps = {
119107
addons = file("${path.module}/bootstrap/addons.yaml")
120108
workloads = file("${path.module}/bootstrap/workloads.yaml")
121109
}
@@ -129,26 +117,19 @@ locals {
129117
}
130118
}
131119

132-
################################################################################
133-
# GitOps Bridge: Metadata
134-
################################################################################
135-
module "gitops_bridge_metadata" {
136-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
137-
138-
cluster_name = module.eks.cluster_name
139-
environment = local.environment
140-
metadata = local.addons_metadata
141-
addons = local.addons
142-
}
143-
144120
################################################################################
145121
# GitOps Bridge: Bootstrap
146122
################################################################################
147123
module "gitops_bridge_bootstrap" {
148-
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
124+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v2.0.0"
149125

150-
argocd_cluster = module.gitops_bridge_metadata.argocd
151-
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
126+
cluster = {
127+
cluster_name = module.eks.cluster_name
128+
environment = local.environment
129+
metadata = local.addons_metadata
130+
addons = local.addons
131+
}
132+
apps = local.argocd_apps
152133
}
153134

154135

@@ -157,7 +138,7 @@ module "gitops_bridge_bootstrap" {
157138
################################################################################
158139
locals {
159140
crossplane_namespace = "crossplane-system"
160-
crossplane_sa_prefix = "provider-aws-*"
141+
crossplane_sa_prefix = "provider-*" # You can scope down based on the provider name
161142
}
162143

163144
module "crossplane_irsa_aws" {

0 commit comments

Comments
 (0)