fixing broken urls and eks version

awslabs · May 31, 2024 · bd78470 · bd78470
1 parent 22c597e
commit bd78470
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/bootstrap/terraform/main.tf b/bootstrap/terraform/main.tf
@@ -148,8 +148,9 @@ module "eks_blueprints_addons" {
   enable_argocd = true
   argocd = {
     namespace     = "argocd"
-    chart_version = "6.11.1" # ArgoCD v2.11.2
+    chart_version = "7.1.0" # ArgoCD v2.11.2
     wait          = true
+    wait_for_jobs = true
     timeout       = "600"
     values = [
       templatefile("${path.module}/values/argocd.yaml", {
@@ -160,18 +161,20 @@ module "eks_blueprints_addons" {
   }
   enable_gatekeeper = true
   gatekeeper = {
-    timeout = "600"
-    wait    = true
+    wait          = true
+    wait_for_jobs = true
+    timeout       = "600"
   }
 
   enable_metrics_server               = true
   enable_aws_load_balancer_controller = true
 
   enable_kube_prometheus_stack = true
   kube_prometheus_stack = {
-    wait    = true
-    timeout = "600"
-    values  = [file("${path.module}/values/prometheus.yaml")]
+    wait          = true
+    wait_for_jobs = true
+    timeout       = "600"
+    values        = [file("${path.module}/values/prometheus.yaml")]
   }
 
   depends_on = [module.eks.eks_managed_node_groups]

diff --git a/bootstrap/terraform/values/argocd.yaml b/bootstrap/terraform/values/argocd.yaml
@@ -12,17 +12,17 @@ controller:
       annotations:
         prometheus.io/scrape: true
   env:
-  - name: ARGOCD_K8S_CLIENT_QPS #required for Crossplane too many CRDs https://github.com/argoproj/argo-cd/pull/448
-    value: "300"
+    - name: ARGOCD_K8S_CLIENT_QPS #required for Crossplane too many CRDs https://github.com/argoproj/argo-cd/pull/448
+      value: "300"
 
 repoServer:
   autoscaling:
     enabled: true
     minReplicas: 1
   resources: # Adjust based on your specific use case (required for HPA)
     requests:
-      cpu : "100m"
-      memory : "256Mi"
+      cpu: "100m"
+      memory: "256Mi"
     limits:
       cpu: "200m"
       memory: "512Mi"
@@ -46,8 +46,8 @@ server:
     minReplicas: 1
   resources: # Adjust based on your specific use case (required for HPA)
     requests:
-      cpu : "100m"
-      memory : "256Mi"
+      cpu: "100m"
+      memory: "256Mi"
     limits:
       cpu: "200m"
       memory: "512Mi"
@@ -58,7 +58,7 @@ server:
         prometheus.io/scrape: true
   service:
     type: "LoadBalancer"
-    annotations: 
+    annotations:
       service.beta.kubernetes.io/aws-load-balancer-scheme: "internet-facing"
 
 configs:

diff --git a/bootstrap/terraform/variables.tf b/bootstrap/terraform/variables.tf
@@ -16,7 +16,7 @@ variable "name" {
 variable "cluster_version" {
   type        = string
   description = "Kubernetes Version"
-  default     = "1.30"
+  default     = "1.29"
 }
 
 variable "capacity_type" {

diff --git a/docs/patterns/debugging.md b/docs/patterns/debugging.md
@@ -145,7 +145,7 @@ Debugging Composition Definitions is similar to debugging Compositions.
 ### Providers
 
 There are two ways to install providers in Crossplane. Using `configuration.pkg.crossplane.io` and `provider.pkg.crossplane.io`. In this repository, we use `provider.pkg.crossplane.io`. 
-Note that if you define a `configuration.pkg.crossplane.io` object, Crossplane will create a `provider.pkg.crossplane.io` object. This object is managed by Crossplane. Please refer to [this guide](https://github.com/crossplane/crossplane/blob/master/docs/concepts/packages.md) for more information about Crossplane Packages.
+Note that if you define a `configuration.pkg.crossplane.io` object, Crossplane will create a `provider.pkg.crossplane.io` object. This object is managed by Crossplane. Please refer to [this guide](https://docs.crossplane.io/latest/concepts/packages/) for more information about Crossplane Packages.
 
 If you are experiencing provider issues, steps below are a good starting point. 
 

diff --git a/docs/patterns/vault-integration.md b/docs/patterns/vault-integration.md
@@ -34,7 +34,7 @@ eksctl create cluster -f bootstrap/eksctl/eksctl.yaml
 You can create a vault service in the same cluster as Crossplane or create a service on a VM. 
 
 ### In-cluster
-Follow: https://github.com/crossplane/crossplane/blob/master/docs/guides/vault-as-secret-store.md#prepare-vault
+Follow: https://docs.crossplane.io/latest/guides/vault-as-secret-store/
 
 ### On an external VM
 This VM must be reachable by the Crossplane installation. If you are using an EC2 instance, routing, network ACL, and Security Groups must be configured to allow for traffic from Crossplane pod to the VM.