merge master to branch (#1386)

* chore(deps): update terraform aws to ~> 5.43.0 (#1346) Co-authored-by: Renovate Bot <[email protected]> * fix: amended inconsistent conditional in vpc requester optional c subnets (#1349) * chore(deps): update module github.com/fluxcd/pkg/apis/meta to v1.4.0 (#1347) Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Mik-Nord <[email protected]> * chore(deps): update golang docker tag to v1.22.2 (#1350) Co-authored-by: Renovate Bot <[email protected]> * chore(deps): update dependency ami_id to ami-0e7f06a34d0e91206 (#1348) Co-authored-by: Renovate Bot <[email protected]> * Fix/vpc import changes (#1352) * fix: use capability_root_id instead of capability_id due to a difference in value of this attribute with older capabilities * fix: set Name tag on vpc endpoints * fix: add vpc name to vpc endpoint tag name * Add feature map_public_ip_on_launch to VPC peering. Plus lots of (#1354) formatting * chore(deps): update terraform helm to ~> 2.13.0 (#1351) Co-authored-by: Renovate Bot <[email protected]> * chore(deps): update terraform aws to ~> 5.44.0 (#1353) Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Mik-Nord <[email protected]> * chore(deps): update terraform kubernetes to ~> 2.28.0 (#1355) Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Mik-Nord <[email protected]> * feat: allow disabling of vpc endpoints for peering (#1356) * chore(deps): update dependency ami_id to ami-05ff701182d9fd6b3 (#1358) Co-authored-by: Renovate Bot <[email protected]> * Update Flux manifests for helm-exporter to have human readable YAML (#1357) * chore(deps): update terraform kubernetes to ~> 2.29.0 (#1359) * chore(deps): update terraform azuread to ~> 2.48.0 (#1362) * chore(deps): update terraform aws to ~> 5.45.0 (#1361) * Fixed deprecation (#1363) * Revert "chore(deps): update terraform helm to ~> 2.13.0 (#1351)" (#1364) This reverts commit 627894f. * chore(deps): update dfdsdk/prime-pipeline docker tag to v0.6.39 (#1365) Co-authored-by: Renovate Bot <[email protected]> * Use latest version of Atlantis (#1366) * Use latest version of Atlantis * Use the most recent Atlsntis image * Version lock Grafana (#1370) * chore(deps): update module k8s.io/client-go to v0.29.4 (#1369) Co-authored-by: Renovate Bot <[email protected]> * disabled kube_state_metrics exporter from grafana agent (#1371) * chore(deps): update terraform aws to ~> 5.46.0 (#1375) Co-authored-by: Renovate Bot <[email protected]> * chore(deps): update dependency ami_id to ami-03f2c27d140f7e9c3 (#1372) Co-authored-by: Renovate Bot <[email protected]> * Make the test suite work with k8s.io/client-go v0.30.0 (#1376) * chore(deps): update module k8s.io/client-go to v0.30.0 * Oh my god what year is it?! --------- Co-authored-by: Renovate Bot <[email protected]> * Update GO (#1377) * chore(deps): update terraform htpasswd to ~> 1.2.0 (#1378) Co-authored-by: Renovate Bot <[email protected]> * chore(deps): update module github.com/aws/aws-lambda-go to v1.47.0 (#1373) Co-authored-by: Renovate Bot <[email protected]> * Revert "Revert "chore(deps): update terraform helm to ~> 2.13.0 (#1351)" (#1364)" (#1379) This reverts commit b26ea46. * Go is no lonmger a supported runtime for lambdas. It must now run on (#1380) Amazon Linux * Feat/increase eks alb timeout (#1381) * increase default idletimout on alb * increase default idletimout on alb auth * Feature/increase eks alb idletimeout limit raised again (#1382) * increase idetimeout on alb again * increase idetimeout on alb auth again * chore(deps): update terraform aws to ~> 5.47.0 (#1383) Co-authored-by: Renovate Bot <[email protected]> --------- Co-authored-by: Dev-Excellence Service Account <[email protected]> Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: rifisdfds <[email protected]> Co-authored-by: Mik-Nord <[email protected]> Co-authored-by: Audun V. Nes <[email protected]> Co-authored-by: samidbb <[email protected]>
dfds · May 1, 2024 · 71f2b60 · 71f2b60
1 parent 25d50d1
commit 71f2b60
Show file tree

Hide file tree

Showing 420 changed files with 37,252 additions and 9,322 deletions.
diff --git a/_sub/compute/ec2-instance/versions.tf b/_sub/compute/ec2-instance/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/ec2-keypair/versions.tf b/_sub/compute/ec2-keypair/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/ec2-securitygroup/versions.tf b/_sub/compute/ec2-securitygroup/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/ec2-sgrule-cidr/versions.tf b/_sub/compute/ec2-sgrule-cidr/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/ec2-sgrule-sg/versions.tf b/_sub/compute/ec2-sgrule-sg/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/ecr-repo/versions.tf b/_sub/compute/ecr-repo/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/eks-addons/versions.tf b/_sub/compute/eks-addons/versions.tf
@@ -4,11 +4,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/eks-alb-auth/main.tf b/_sub/compute/eks-alb-auth/main.tf
@@ -22,6 +22,7 @@ resource "aws_lb" "traefik_auth" {
   }
 
   drop_invalid_header_fields = true
+  idle_timeout = 300
 }
 
 resource "aws_lb_target_group" "traefik_auth_blue_variant" {

diff --git a/_sub/compute/eks-alb-auth/versions.tf b/_sub/compute/eks-alb-auth/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/eks-alb/main.tf b/_sub/compute/eks-alb/main.tf
@@ -22,6 +22,7 @@ resource "aws_lb" "traefik" {
   }
 
   drop_invalid_header_fields = true
+  idle_timeout = 300
 }
 
 resource "aws_lb_target_group" "traefik_blue_variant" {

diff --git a/_sub/compute/eks-alb/versions.tf b/_sub/compute/eks-alb/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/eks-cluster/versions.tf b/_sub/compute/eks-cluster/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/eks-heptio/versions.tf b/_sub/compute/eks-heptio/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     local = {
       source  = "hashicorp/local"

diff --git a/_sub/compute/eks-inactivity-cleanup/versions.tf b/_sub/compute/eks-inactivity-cleanup/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 

diff --git a/_sub/compute/eks-nlb/versions.tf b/_sub/compute/eks-nlb/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/eks-nodegroup-managed/versions.tf b/_sub/compute/eks-nodegroup-managed/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/eks-workers/versions.tf b/_sub/compute/eks-workers/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
diff --git a/_sub/compute/elb-inactivity-cleanup/versions.tf b/_sub/compute/elb-inactivity-cleanup/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 

diff --git a/_sub/compute/helm-atlantis/versions.tf b/_sub/compute/helm-atlantis/versions.tf
@@ -10,23 +10,23 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     github = {
       source  = "integrations/github"
       version = "~> 6.2.0"
     }
     htpasswd = {
       source  = "loafoe/htpasswd"
-      version = "~> 1.0.0"
+      version = "~> 1.2.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2.12.0"
+      version = "~> 2.13.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/_sub/compute/helm-crossplane/versions.tf b/_sub/compute/helm-crossplane/versions.tf
@@ -4,15 +4,15 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2.12.0"
+      version = "~> 2.13.0"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"

diff --git a/_sub/compute/helm-goldpinger/versions.tf b/_sub/compute/helm-goldpinger/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2.12.0"
+      version = "~> 2.13.0"
     }
   }
 }
diff --git a/_sub/compute/helm-kube-prometheus-stack/main.tf b/_sub/compute/helm-kube-prometheus-stack/main.tf
@@ -201,5 +201,5 @@ resource "azuread_application" "grafana" {
 
 resource "azuread_application_password" "grafana" {
   count                 = length(var.grafana_azure_tenant_id) == 36 ? 1 : 0
-  application_object_id = azuread_application.grafana[0].object_id
+  application_id = "/applications/${azuread_application.grafana[0].object_id}"
 }
diff --git a/_sub/compute/helm-kube-prometheus-stack/version.tf b/_sub/compute/helm-kube-prometheus-stack/version.tf
@@ -4,23 +4,23 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     github = {
       source  = "integrations/github"
       version = "~> 6.2.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2.12.0"
+      version = "~> 2.13.0"
     }
     random = {
       source  = "hashicorp/random"
       version = "~> 3.6.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "~> 2.47.0"
+      version = "~> 2.48.0"
     }
   }
 }
diff --git a/_sub/compute/helm-kyverno/versions.tf b/_sub/compute/helm-kyverno/versions.tf
@@ -10,15 +10,15 @@ terraform {
   required_providers {
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2.12.0"
+      version = "~> 2.13.0"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"
       version = "~> 1.14.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/helm-nvidia-device-plugin/versions.tf b/_sub/compute/helm-nvidia-device-plugin/versions.tf
@@ -3,15 +3,15 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2.12.0"
+      version = "~> 2.13.0"
     }
   }
 }
diff --git a/_sub/compute/k8s-blaster-namespace/versions.tf b/_sub/compute/k8s-blaster-namespace/versions.tf
@@ -3,15 +3,15 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     github = {
       source  = "integrations/github"
       version = "~> 6.2.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/k8s-clusterrole/versions.tf b/_sub/compute/k8s-clusterrole/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/k8s-crossplane-provider-confluent/versions.tf b/_sub/compute/k8s-crossplane-provider-confluent/versions.tf
@@ -4,7 +4,7 @@ terraform {
 
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
 
     kubectl = {

diff --git a/_sub/compute/k8s-namespace/version.tf b/_sub/compute/k8s-namespace/version.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/k8s-priority-class/versions.tf b/_sub/compute/k8s-priority-class/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/k8s-service-account/versions.tf b/_sub/compute/k8s-service-account/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/k8s-subnet-exporter/version.tf b/_sub/compute/k8s-subnet-exporter/version.tf
@@ -3,11 +3,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.27.0"
+      version = "~> 2.29.0"
     }
   }
 }
diff --git a/_sub/compute/k8s-traefik-flux/versions.tf b/_sub/compute/k8s-traefik-flux/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
     github = {
       source  = "integrations/github"
@@ -16,7 +16,7 @@ terraform {
     }
     htpasswd = {
       source  = "loafoe/htpasswd"
-      version = "~> 1.0.0"
+      version = "~> 1.2.0"
     }
     random = {
       source  = "hashicorp/random"

diff --git a/_sub/database/postgres-restore/versions.tf b/_sub/database/postgres-restore/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.42.0"
+      version = "~> 5.47.0"
     }
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ resource "aws_lb" "traefik_auth" { @@
       }
       drop_invalid_header_fields = true
+      idle_timeout = 300
     }
     resource "aws_lb_target_group" "traefik_auth_blue_variant" {
@@ Expand Down @@