* 2.3.2 -- 2024-10-11

- incorporate changes for 1.30 - isto-profile chart changes (desire to move to a public chart) - add ami_id to nodegroup
terraform-modules · Oct 11, 2024 · 4014b00 · 4014b00
1 parent 9c6e7e6
commit 4014b00
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,3 +56,8 @@
 
 * 2.3.1 -- 2024-09-27
   - add containerPort.https=10250 for metric-server in v1.29, v1.30.  Newer chart uses different value.
+
+* 2.3.2 -- 2024-10-11
+  - incorporate changes for 1.30
+    - isto-profile chart changes (desire to move to a public chart)
+    - add ami_id to nodegroup
diff --git a/common/version.tf b/common/version.tf
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "2.1.0"
+  _module_version = "2.3.2"
 }
diff --git a/...cluster-tf-upgrade/1.30/common-services/charts/istio-profile/templates/istiooperator.yaml b/...cluster-tf-upgrade/1.30/common-services/charts/istio-profile/templates/istiooperator.yaml
@@ -97,7 +97,6 @@ spec:
         datadog: {}
         stackdriver: {}
       imagePullSecrets: []
-      oneNamespace: false
       defaultNodeSelector: {}
       configValidation: true
       multiCluster:
@@ -111,7 +110,6 @@ spec:
       defaultPodDisruptionBudget:
         enabled: true
       priorityClassName: ""
-      useMCP: false
       sds:
         token:
           aud: istio-ca
@@ -134,26 +132,17 @@ spec:
         targetAverageUtilization: 80
       nodeSelector: {}
       keepaliveMaxServerConnectionAge: 30m
-      enableProtocolSniffingForOutbound: true
-      enableProtocolSniffingForInbound: true
       deploymentLabels:
       configMap: true
 
     telemetry:
       enabled: {{ .Values.telemetry.enabled }}
       v2:
         enabled: true
-        metadataExchange:
-          wasmEnabled: false
         prometheus:
-          wasmEnabled: false
           enabled: true
         stackdriver:
           enabled: false
-          logging: false
-          monitoring: false
-          topology: false
-          configOverride: {}
 
     istiodRemote:
       injectionURL: ""

diff --git a/examples/full-cluster-tf-upgrade/1.30/main.tf b/examples/full-cluster-tf-upgrade/1.30/main.tf
@@ -102,6 +102,7 @@ resource "aws_eks_node_group" "eks-nodegroup" {
   node_group_name = format("%v%v-nodegroup", local._prefixes["eks"], var.cluster_name)
   node_role_arn   = module.role_eks-nodegroup.role_arn
   subnet_ids      = local.subnets
+  ami_type        = "AL2_x86_64"
   #  instance_types = [var.eks_instance_type]
   #  disk_size      = var.eks_instance_disk_size
 
@@ -177,7 +178,7 @@ resource "aws_launch_template" "eks-nodegroup" {
 
     tags = merge(
       local.base_tags,
-      tomap({ "boc:created_by" = "eks-launch-template" }),
+      { "boc:created_by" = "eks-launch-template" },
       local.common_tags,
       local.launch_template_tags,
       var.tags,
@@ -190,7 +191,7 @@ resource "aws_launch_template" "eks-nodegroup" {
 
     tags = merge(
       local.base_tags,
-      tomap({ "boc:created_by" = "eks-launch-template" }),
+      { "boc:created_by" = "eks-launch-template" },
       local.common_tags,
       var.tags,
       var.application_tags,
@@ -202,7 +203,7 @@ resource "aws_launch_template" "eks-nodegroup" {
 
     tags = merge(
       local.base_tags,
-      tomap({ "boc:created_by" = "eks-launch-template" }),
+      { "boc:created_by" = "eks-launch-template" },
       local.common_tags,
       var.tags,
       var.application_tags,