Merge branch 'main' into external-secrets-operator

docs/add-ons/velero.md

@@ -1,6 +1,6 @@
-# [Velero](https://velero.io/)
+# Velero
 
-Velero is an open source tool to safely backup and restore, perform disaster recovery, and migrate Kubernetes cluster resources and persistent volumes.
+[Velero](https://velero.io/) is an open source tool to safely backup and restore, perform disaster recovery, and migrate Kubernetes cluster resources and persistent volumes.
 
 - [Helm chart](https://github.com/vmware-tanzu/helm-charts/tree/main/charts/velero)
 - [Plugin for AWS](https://github.com/vmware-tanzu/velero-plugin-for-aws)

modules/aws-eks-managed-node-groups/main.tf

@@ -62,6 +62,8 @@ resource "aws_eks_node_group" "managed_ng" {
     }
   }
 
+  labels = local.managed_node_group["k8s_labels"]
+
   tags = local.common_tags
 
   dynamic "timeouts" {

modules/kubernetes-addons/README.md

@@ -110,6 +110,7 @@
 | <a name="input_crossplane_aws_provider"></a> [crossplane\_aws\_provider](#input\_crossplane\_aws\_provider) | AWS Provider config for Crossplane | <pre>object({<br>    enable                   = bool<br>    provider_aws_version     = string<br>    additional_irsa_policies = list(string)<br>  })</pre> | <pre>{<br>  "additional_irsa_policies": [],<br>  "enable": false,<br>  "provider_aws_version": "v0.24.1"<br>}</pre> | no |
 | <a name="input_crossplane_helm_config"></a> [crossplane\_helm\_config](#input\_crossplane\_helm\_config) | Crossplane Helm Chart config | `any` | `null` | no |
 | <a name="input_crossplane_jet_aws_provider"></a> [crossplane\_jet\_aws\_provider](#input\_crossplane\_jet\_aws\_provider) | AWS Provider Jet AWS config for Crossplane | <pre>object({<br>    enable                   = bool<br>    provider_aws_version     = string<br>    additional_irsa_policies = list(string)<br>  })</pre> | <pre>{<br>  "additional_irsa_policies": [],<br>  "enable": false,<br>  "provider_aws_version": "v0.24.1"<br>}</pre> | no |
+| <a name="input_custom_image_registry_uri"></a> [custom\_image\_registry\_uri](#input\_custom\_image\_registry\_uri) | Custom image registry URI map of `{region = dkr.endpoint }` | `map(string)` | `{}` | no |
 | <a name="input_eks_cluster_domain"></a> [eks\_cluster\_domain](#input\_eks\_cluster\_domain) | The domain for the EKS cluster | `string` | `""` | no |
 | <a name="input_eks_cluster_endpoint"></a> [eks\_cluster\_endpoint](#input\_eks\_cluster\_endpoint) | Endpoint for your Kubernetes API server | `string` | `null` | no |
 | <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | EKS Cluster Id | `string` | n/a | yes |

modules/kubernetes-addons/locals.tf

@@ -47,31 +47,34 @@ locals {
 
   # For addons that pull images from a region-specific ECR container registry by default
   # for more information see: https://docs.aws.amazon.com/eks/latest/userguide/add-ons-images.html
-  amazon_container_image_registry_uris = tomap({
-    af-south-1     = "877085696533.dkr.ecr.af-south-1.amazonaws.com",
-    ap-east-1      = "800184023465.dkr.ecr.ap-east-1.amazonaws.com",
-    ap-northeast-1 = "602401143452.dkr.ecr.ap-northeast-1.amazonaws.com",
-    ap-northeast-2 = "602401143452.dkr.ecr.ap-northeast-2.amazonaws.com",
-    ap-northeast-3 = "602401143452.dkr.ecr.ap-northeast-3.amazonaws.com",
-    ap-south-1     = "602401143452.dkr.ecr.ap-south-1.amazonaws.com",
-    ap-southeast-1 = "602401143452.dkr.ecr.ap-southeast-1.amazonaws.com",
-    ap-southeast-2 = "602401143452.dkr.ecr.ap-southeast-2.amazonaws.com",
-    ca-central-1   = "602401143452.dkr.ecr.ca-central-1.amazonaws.com",
-    cn-north-1     = "918309763551.dkr.ecr.cn-north-1.amazonaws.com.cn",
-    cn-northwest-1 = "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn",
-    eu-central-1   = "602401143452.dkr.ecr.eu-central-1.amazonaws.com",
-    eu-north-1     = "602401143452.dkr.ecr.eu-north-1.amazonaws.com",
-    eu-south-1     = "590381155156.dkr.ecr.eu-south-1.amazonaws.com",
-    eu-west-1      = "602401143452.dkr.ecr.eu-west-1.amazonaws.com",
-    eu-west-2      = "602401143452.dkr.ecr.eu-west-2.amazonaws.com",
-    eu-west-3      = "602401143452.dkr.ecr.eu-west-3.amazonaws.com",
-    me-south-1     = "558608220178.dkr.ecr.me-south-1.amazonaws.com",
-    sa-east-1      = "602401143452.dkr.ecr.sa-east-1.amazonaws.com",
-    us-east-1      = "602401143452.dkr.ecr.us-east-1.amazonaws.com",
-    us-east-2      = "602401143452.dkr.ecr.us-east-2.amazonaws.com",
-    us-gov-east-1  = "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com",
-    us-gov-west-1  = "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com",
-    us-west-1      = "602401143452.dkr.ecr.us-west-1.amazonaws.com",
-    us-west-2      = "602401143452.dkr.ecr.us-west-2.amazonaws.com"
-  })
+  amazon_container_image_registry_uris = merge(
+    {
+      af-south-1     = "877085696533.dkr.ecr.af-south-1.amazonaws.com",
+      ap-east-1      = "800184023465.dkr.ecr.ap-east-1.amazonaws.com",
+      ap-northeast-1 = "602401143452.dkr.ecr.ap-northeast-1.amazonaws.com",
+      ap-northeast-2 = "602401143452.dkr.ecr.ap-northeast-2.amazonaws.com",
+      ap-northeast-3 = "602401143452.dkr.ecr.ap-northeast-3.amazonaws.com",
+      ap-south-1     = "602401143452.dkr.ecr.ap-south-1.amazonaws.com",
+      ap-southeast-1 = "602401143452.dkr.ecr.ap-southeast-1.amazonaws.com",
+      ap-southeast-2 = "602401143452.dkr.ecr.ap-southeast-2.amazonaws.com",
+      ca-central-1   = "602401143452.dkr.ecr.ca-central-1.amazonaws.com",
+      cn-north-1     = "918309763551.dkr.ecr.cn-north-1.amazonaws.com.cn",
+      cn-northwest-1 = "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn",
+      eu-central-1   = "602401143452.dkr.ecr.eu-central-1.amazonaws.com",
+      eu-north-1     = "602401143452.dkr.ecr.eu-north-1.amazonaws.com",
+      eu-south-1     = "590381155156.dkr.ecr.eu-south-1.amazonaws.com",
+      eu-west-1      = "602401143452.dkr.ecr.eu-west-1.amazonaws.com",
+      eu-west-2      = "602401143452.dkr.ecr.eu-west-2.amazonaws.com",
+      eu-west-3      = "602401143452.dkr.ecr.eu-west-3.amazonaws.com",
+      me-south-1     = "558608220178.dkr.ecr.me-south-1.amazonaws.com",
+      sa-east-1      = "602401143452.dkr.ecr.sa-east-1.amazonaws.com",
+      us-east-1      = "602401143452.dkr.ecr.us-east-1.amazonaws.com",
+      us-east-2      = "602401143452.dkr.ecr.us-east-2.amazonaws.com",
+      us-gov-east-1  = "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com",
+      us-gov-west-1  = "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com",
+      us-west-1      = "602401143452.dkr.ecr.us-west-1.amazonaws.com",
+      us-west-2      = "602401143452.dkr.ecr.us-west-2.amazonaws.com"
+    },
+    var.custom_image_registry_uri
+  )
 }

modules/kubernetes-addons/variables.tf

@@ -124,6 +124,12 @@ variable "enable_amazon_eks_aws_ebs_csi_driver" {
   default     = false
 }
 
+variable "custom_image_registry_uri" {
+  description = "Custom image registry URI map of `{region = dkr.endpoint }`"
+  type        = map(string)
+  default     = {}
+}
+
 #-----------CLUSTER AUTOSCALER-------------
 variable "enable_cluster_autoscaler" {
   description = "Enable Cluster autoscaler add-on"