* 2.3.1 -- 2024-09-27

- add containerPort.https=10250 for metric-server in v1.29, v1.30. Newer chart uses different value.
terraform-modules · Sep 27, 2024 · 6d4214f · 6d4214f
1 parent e28bd24
commit 6d4214f
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,3 +54,5 @@
   - add charts.yml, images.yml, charts-images.tf for getting current versions of stuff
   - add 1.30 tree
 
+* 2.3.1 -- 2024-09-27
+  - add containerPort.https=10250 for metric-server in v1.29, v1.30.  Newer chart uses different value.
diff --git a/examples/full-cluster-tf-upgrade/1.29/common-services/main.tf b/examples/full-cluster-tf-upgrade/1.29/common-services/main.tf
@@ -44,6 +44,10 @@ resource "helm_release" "metrics-server" {
   #    name = "extraArgs[4]"
   #    value = "--kubelet-insecure-tls=true"
   #  }
+  set {
+    name  = "containerPorts.https"
+    value = 10250
+  }
   set {
     name = "image.registry"
     #    value = local.account_ecr_registry

diff --git a/examples/full-cluster-tf-upgrade/1.30/charts-images.tf b/examples/full-cluster-tf-upgrade/1.30/charts-images.tf
@@ -2,3 +2,7 @@ locals {
   chart_settings  = yamldecode(file("${path.root}/charts.yml"))
   images_settings = yamldecode(file("${path.root}/images.yml"))
 }
+
+# locations
+## ./common-services/cluster-autoscaler/cluster-autoscaler.tf
+## ./common-services/images.tf
diff --git a/examples/full-cluster-tf-upgrade/1.30/common-services/cluster-autoscaler/tf-run.data b/examples/full-cluster-tf-upgrade/1.30/common-services/cluster-autoscaler/tf-run.data
@@ -1,8 +1,10 @@
-VERSION 1.4.2
+VERSION 2.0.0
+TAG setup
 REMOTE-STATE
 COMMAND tf-directory-setup.py -l none -f
 COMMAND setup-new-directory.sh
 
+TAG links
 LINKTOP init
 LINKTOP includes.d/variables.account_tags.tf
 LINKTOP includes.d/variables.account_tags.auto.tfvars
@@ -26,6 +28,17 @@ LINK versions.tf
 LINK version.tf
 LINK variables.vpc.tf
 LINK variables.vpc.auto.tfvars
+# links for images, charts
+LINK images.yml
+LINK charts.yml
+LINK charts-images.tf
+
+TAG init
 COMMAND tf-init 
 
+TAG start
 ALL
+
+TAG state-link
+COMMAND tf-directory-setup.py -l s3
+
diff --git a/examples/full-cluster-tf-upgrade/1.30/common-services/main.tf b/examples/full-cluster-tf-upgrade/1.30/common-services/main.tf
@@ -44,6 +44,10 @@ resource "helm_release" "metrics-server" {
   #    name = "extraArgs[4]"
   #    value = "--kubelet-insecure-tls=true"
   #  }
+  set {
+    name  = "containerPorts.https"
+    value = 10250
+  }
   set {
     name = "image.registry"
     #    value = local.account_ecr_registry

diff --git a/examples/full-cluster-tf-upgrade/1.30/common-services/tf-run.data b/examples/full-cluster-tf-upgrade/1.30/common-services/tf-run.data
@@ -1,4 +1,4 @@
-VERSION 2.0.1
+VERSION 2.1.0
 REMOTE-STATE
 COMMAND tf-directory-setup.py -l none -f
 COMMAND setup-new-directory.sh
@@ -27,6 +27,10 @@ LINK versions.tf
 LINK version.tf
 LINK variables.vpc.tf
 LINK variables.vpc.auto.tfvars
+# links for images, charts
+LINK images.yml
+LINK charts.yml
+LINK charts-images.tf
 
 TAG init
 COMMAND tf-init 

diff --git a/examples/full-cluster-tf-upgrade/1.30/common-services/variables.images.auto.tfvars b/examples/full-cluster-tf-upgrade/1.30/common-services/variables.images.auto.tfvars
@@ -1,3 +1,21 @@
+wanted_charts = [
+  "cert-manager",
+  "metrics-server",
+]
+wanted_images = [
+  "cert-manager-controller",
+  "cert-manager-cainjector",
+  "cert-manager-webhook",
+  "cert-manager-ctl",
+  "metrics-server",
+  "istio-operator",
+  "istio-pilot",
+  "istio-proxyv2",
+  "prometheus",
+  "alertmanager",
+  "prometheus-operator",
+]
+
 chart_details = {
   "cert-manager" = {
     name       = "cert-manager"

diff --git a/examples/full-cluster-tf-upgrade/1.30/common-services/variables.images.tf b/examples/full-cluster-tf-upgrade/1.30/common-services/variables.images.tf
@@ -24,3 +24,15 @@ variable "image_details" {
   default = {}
 }
 
+
+variable "wanted_charts" {
+  description = "List of chart names (from charts.yml) desired for this directory/module"
+  type        = list(string)
+  default     = []
+}
+
+variable "wanted_images" {
+  description = "List of image names (from images.yml) desired for this directory/module"
+  type        = list(string)
+  default     = []
+}