General Upgrades and Housekeeping for Terraform bootstrap #193

edgarsilva948 · 2024-05-30T17:04:24Z

What does this PR do?

Eliminates the eks blueprints addon module, directly linking to it.
Removes the variables file to align with EKS Blueprints best practices.
Upgrades all related blueprint modules including IRSA, EKS, and Addons.
Upgrades Crossplane to enable new metrics.
Revises Helm values for consistent naming and organization.
Replaces the Crossplane grafana dashboard and adds an ArgoCD dashboard.
Replaces the outdated gavinbunney/kubectl.
Transforms the cleanup process from a script to documentation.

Motivation

The motivation behind this pull request is to enhance maintainability, and ensure that our Blueprints adhere to the latest best practices.

More

Yes, I have tested the PR using my local account setup (Please refer to the Additional Notes for test evidence).
Yes, I have added a new example under examples to support my PR.
Yes, I have updated the docs for this feature.
Yes, I have linked to an issue or feature request (applicable to PRs that solve a bug or a feature request).

Note:

Not all PRs require examples and docs.
We prefer small, well-tested pull requests. Please ensure your pull requests are self-contained, and commits are squashed.

For Moderators

E2E Test successfully complete before merge?

Additional Notes

N/A

edgarsilva948 · 2024-05-30T17:08:12Z

this PR fixes #166

candonov · 2024-05-30T17:58:17Z

bootstrap/terraform/main.tf

+  name   = "crossplane-blueprints"
+  region = "us-east-1"


What is the reason for removing the vars here?

I've seen the EKS Blueprints adopting this pattern of not having the variables file, I think it makes it easier for the user:

variables.tf.

locals.

keep the vars here as well, we need them to be able to pass and override on command line

bootstrap/terraform/main.tf

candonov · 2024-05-30T18:03:48Z

bootstrap/terraform/main.tf

+  cluster_version = "1.30"
+  capacity_type   = "SPOT"


same question, what is the reason for removing the vars?

the same here:

version.

same here, keep the vars

bootstrap/terraform/main.tf

candonov · 2024-05-30T18:49:35Z

bootstrap/terraform/main.tf

    values = [
-      templatefile("${path.module}/argocd-values.yaml", {
+      templatefile("${path.module}/values/control-plane-eks-argocd-stack.yaml", {


It is nice to organize under values/ folder but why prefix with control-plane-eks-?

there is no specific reason.. I thought it would be clearer, but I can remove it

candonov · 2024-05-30T18:53:06Z

bootstrap/terraform/main.tf

+  chart            = "crossplane"
+  chart_version    = "1.16.0"
+  repository       = "https://charts.crossplane.io/stable/"
+  values           = [file("${path.module}/values/control-plane-eks-crossplane-stack.yaml")]


Nice touch! Love it! Much more readable!

candonov · 2024-05-30T18:53:32Z

bootstrap/terraform/main.tf

@@ -210,8 +207,8 @@ locals {
  crossplane_namespace = "crossplane-system"

  upjet_aws_provider = {
-    enable               = var.enable_upjet_aws_provider # defaults to true
-    version              = "v1.4.0"
+    enable               = true


keep the variable

candonov · 2024-05-30T18:53:41Z

bootstrap/terraform/main.tf

@@ -233,15 +230,15 @@ locals {
  }

  aws_provider = {
-    enable               = var.enable_aws_provider # defaults to false
+    enable               = false


keep the variable

candonov · 2024-05-30T18:53:51Z

bootstrap/terraform/main.tf

    version              = "v0.48.0"
    name                 = "aws-provider"
    runtime_config       = "aws-runtime-config"
    provider_config_name = "aws-provider-config" #this is the providerConfigName used in all the examples in this repo
  }

  kubernetes_provider = {
-    enable               = var.enable_kubernetes_provider # defaults to true
+    enable               = true


keep the variable

candonov · 2024-05-30T18:54:00Z

bootstrap/terraform/main.tf

@@ -251,7 +248,7 @@ locals {
  }

  helm_provider = {
-    enable               = var.enable_helm_provider # defaults to true
+    enable               = true


keep the variable

edgarsilva948 · 2024-05-30T20:46:50Z

@candonov adjusted it with your recommendations

candonov · 2024-05-31T00:17:55Z

bootstrap/terraform/main.tf

    values = [
-      templatefile("${path.module}/argocd-values.yaml", {
+      templatefile("${path.module}/values/argocd-stack.yaml", {


Let's have the file name match the add-on name, argocd.yaml

candonov · 2024-05-31T00:18:07Z

bootstrap/terraform/main.tf

-    values = [file("${path.module}/kube-prometheus-stack-values.yaml")]
+    wait    = true
+    timeout = "600"
+    values  = [file("${path.module}/values/prometheus-stack.yaml")]


kube-prometheus-stack

candonov · 2024-05-31T00:18:47Z

bootstrap/terraform/main.tf

+  chart            = "crossplane"
+  chart_version    = "1.16.0"
+  repository       = "https://charts.crossplane.io/stable/"
+  values           = [file("${path.module}/values/crossplane-stack.yaml")]


crossplane.yaml

candonov

lgtm

edgarsilva948 added 16 commits May 30, 2024 01:00

upgrading module eks to 20.12 and eks to 1.30

edb6ef6

upgrading crossplane to 1.16

7ae0cdd

upgrading aws provider to be compatible with eks module

5948d20

adding the cluster creator admin

2647a0e

upgrading argocd chart to last stable version

490af87

replacing the kubectl provider to use the alekc/kubectl

36105fa

adjusting the helm values to a separate directory

3998782

adjusting argo filename

574e531

fixing crossplane to use a separate file

2d94707

using eks blueprints addon directly to deploy crossplane

f67921b

replacing variables to local config

d6947d5

increase timeout to avoid first deploy errors

4ec3420

increase timeout to avoid first deploy errors

2542061

removing gatekeeper since it's not required

5334072

removing internal addon module

45cc43b

adjusting the crossplane grafana dashboard

5b0def6

edgarsilva948 requested review from nabuskey, vara-bonthu, nimakaviani, candonov, csantanapr, 7navyasa and johnphilips3 as code owners May 30, 2024 17:04

candonov reviewed May 30, 2024

View reviewed changes

edgarsilva948 added 3 commits May 30, 2024 16:46

adding back provider boolean variables

e4d324d

adding gatekeeper back with the wait and timeout

53e905e

remove the prefix from helm values

9540cd3

adding the variables back

88980dc

candonov reviewed May 31, 2024

View reviewed changes

adjusting the helm values name

f206ffa

candonov approved these changes May 31, 2024

View reviewed changes

candonov merged commit de9662d into awslabs:main May 31, 2024
1 check passed

edgarsilva948 mentioned this pull request May 31, 2024

[Bug]: Use of gavinbunney/kubectl is error prone #166

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

General Upgrades and Housekeeping for Terraform bootstrap #193

General Upgrades and Housekeeping for Terraform bootstrap #193

edgarsilva948 commented May 30, 2024

edgarsilva948 commented May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

candonov May 30, 2024 •

edited

Loading

edgarsilva948 May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

edgarsilva948 May 30, 2024

candonov May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

candonov May 30, 2024

edgarsilva948 May 30, 2024

edgarsilva948 commented May 30, 2024

candonov May 31, 2024

candonov May 31, 2024

candonov May 31, 2024

candonov left a comment

General Upgrades and Housekeeping for Terraform bootstrap #193

General Upgrades and Housekeeping for Terraform bootstrap #193

Conversation

edgarsilva948 commented May 30, 2024

What does this PR do?

Motivation

More

For Moderators

Additional Notes

edgarsilva948 commented May 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

candonov May 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

edgarsilva948 commented May 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

candonov left a comment

Choose a reason for hiding this comment

candonov May 30, 2024 •

edited

Loading