Merge branch 'main' into dependabot/go_modules/test/google.golang.org…

…/protobuf-1.33.0
aws-ia · Jan 22, 2025 · ec3688c · ec3688c
2 parents c8bd783 + 181db3d
commit ec3688c
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 78 deletions.
diff --git a/charts/mendix-installer/templates/mendix-installer-configmap.yaml b/charts/mendix-installer/templates/mendix-installer-configmap.yaml
@@ -6,7 +6,16 @@ metadata:
 data:
   mxpc-cli-installer-script: | 
     #/bin/sh
-    
+
+    echo "Configuring kubeconfig for mxpc-cli..."
+    KUBE_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
+    KUBE_SERVER="https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_SERVICE_PORT}"
+    kubectl config set-cluster default --server="${KUBE_SERVER}" --certificate-authority=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+    kubectl config set-credentials default --token="${KUBE_TOKEN}"
+    kubectl config set-context default --cluster=default --user=default
+    kubectl config use-context default
+    echo "Kubeconfig for mxpc-cli configured."
+
     wget https://cdn.mendix.com/mendix-for-private-cloud/mxpc-cli/mxpc-cli-{{ .Values.mendixOperatorVersion }}-linux-amd64.tar.gz
     tar xvf mxpc-cli-{{ .Values.mendixOperatorVersion }}-linux-amd64.tar.gz
     ./mxpc-cli base-install --namespace mendix -i {{ .Values.namespaceID }} -s {{ .Values.namespaceSecret }} --clusterMode connected --clusterType generic --clusterTag="aws-reference-deployment"

diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -3,11 +3,13 @@ module "mendix_private_cloud_example" {
 
   aws_region                   = var.aws_region
   domain_name                  = var.domain_name
+  allowed_ips                  = var.allowed_ips
   certificate_expiration_email = var.certificate_expiration_email
   s3_bucket_name               = var.s3_bucket_name
   namespace_id                 = var.namespace_id
   namespace_secret             = var.namespace_secret
   mendix_operator_version      = var.mendix_operator_version
+  environments_internal_names  = var.environments_internal_names
 }
 
 provider "aws" {}
diff --git a/examples/basic/variables.tf b/examples/basic/variables.tf
@@ -26,7 +26,7 @@ variable "namespace_secret" {
 variable "mendix_operator_version" {
   type        = string
   description = "Mendix Private Cloud Operator version"
-  default     = "2.10.0"
+  default     = "2.16.0"
 }
 
 variable "certificate_expiration_email" {

diff --git a/main.tf b/main.tf
@@ -108,11 +108,11 @@ resource "aws_ebs_encryption_by_default" "ebs_encryption" {
 
 module "eks_blueprints" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "~> 19.13"
+  version = "~> 19.21"
 
   # EKS CLUSTER
   cluster_name    = local.cluster_name
-  cluster_version = "1.26"
+  cluster_version = var.eks_version
   vpc_id          = module.vpc.vpc_id
   subnet_ids      = module.vpc.vpc_private_subnets
 
@@ -221,7 +221,7 @@ module "monitoring" {
   cloudwatch_log_group_arn  = aws_cloudwatch_log_group.aws_for_fluentbit.arn
   cloudwatch_log_group_name = aws_cloudwatch_log_group.aws_for_fluentbit.name
 
-  depends_on = [module.eks_blueprints_kubernetes_addons]
+  depends_on = [module.eks_blueprints_kubernetes_addons, aws_eks_addon.adot_addon]
 }
 
 resource "kubernetes_namespace" "mendix" {
@@ -267,14 +267,14 @@ resource "helm_release" "mendix_installer" {
 resource "aws_eks_addon" "adot_addon" {
   cluster_name  = module.eks_blueprints.cluster_name
   addon_name    = "adot"
-  addon_version = "v0.80.0-eksbuild.2"
+  addon_version = "v0.94.1-eksbuild.1"
 
   depends_on = [module.eks_blueprints, module.eks_blueprints_kubernetes_addons]
 }
 
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "~> 5.20"
+  version = "~> 5.39"
 
   role_name_prefix = "${module.eks_blueprints.cluster_name}-ebs-csi-driver-"
 

diff --git a/modules/container-registry/providers.tf b/modules/container-registry/providers.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.35"
+      version = ">= 5.46"
     }
   }
 }
diff --git a/modules/databases/providers.tf b/modules/databases/providers.tf
@@ -4,11 +4,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.35"
+      version = ">= 5.46"
     }
     random = {
       source  = "hashicorp/random"
-      version = ">= 3.4.3"
+      version = ">= 3.6"
     }
   }
 }
diff --git a/modules/file-storage/providers.tf b/modules/file-storage/providers.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.35"
+      version = ">= 5.46"
     }
   }
 }
diff --git a/modules/monitoring/providers.tf b/modules/monitoring/providers.tf
@@ -4,19 +4,19 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.35"
+      version = ">= 5.46"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = ">= 2.10"
+      version = ">= 2.29.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = ">= 2.7.1"
+      version = ">= 2.13"
     }
     random = {
       source  = "hashicorp/random"
-      version = ">= 3.4.3"
+      version = ">= 3.6"
     }
   }
-}
+}
diff --git a/modules/vpc/main.tf b/modules/vpc/main.tf
@@ -2,7 +2,7 @@ data "aws_availability_zones" "available" {}
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "5.1.2"
+  version = "5.7.1"
 
   name                 = "${var.cluster_name}-vpc"
   cidr                 = "10.0.0.0/16"

diff --git a/modules/vpc/providers.tf b/modules/vpc/providers.tf
@@ -4,11 +4,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.35"
+      version = ">= 5.46"
     }
     random = {
       source  = "hashicorp/random"
-      version = ">= 3.4.3"
+      version = ">= 3.6"
     }
   }
 }
diff --git a/providers.tf b/providers.tf
@@ -13,27 +13,19 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 5.10"
+      version = ">= 5.46"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = ">= 2.16.1"
+      version = ">= 2.29.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = ">= 2.7.1"
+      version = ">= 2.13"
     }
     random = {
       source  = "hashicorp/random"
-      version = ">= 3.4.3"
-    }
-    template = {
-      source  = "hashicorp/template"
-      version = ">= 2.2.0"
-    }
-    kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = ">= 1.14"
+      version = ">= 3.6"
     }
   }
 }

diff --git a/test/go.mod b/test/go.mod
@@ -8,11 +8,11 @@ require (
 )
 
 require (
-	cloud.google.com/go v0.107.0 // indirect
-	cloud.google.com/go/compute v1.15.1 // indirect
+	cloud.google.com/go v0.110.0 // indirect
+	cloud.google.com/go/compute v1.19.1 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v0.8.0 // indirect
-	cloud.google.com/go/storage v1.27.0 // indirect
+	cloud.google.com/go/iam v0.13.0 // indirect
+	cloud.google.com/go/storage v1.28.1 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
@@ -25,12 +25,12 @@ require (
 	github.com/go-sql-driver/mysql v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
+	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
 	github.com/googleapis/gnostic v0.4.1 // indirect
 	github.com/gruntwork-io/go-commons v0.8.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
@@ -62,19 +62,19 @@ require (
 	github.com/urfave/cli v1.22.2 // indirect
 	github.com/zclconf/go-cty v1.9.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/oauth2 v0.4.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.103.0 // indirect
+	google.golang.org/api v0.114.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect