Merge pull request #38 from nimbux911/update-k8s-registry

Update k8s registry

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [4.6.1] - 2023-03-30
+
+### Fixed
+
+- Update kubernetes registry from k8s.gcr.io Image to registry.k8s.io, based on this [announcement](https://kubernetes.io/blog/2023/02/06/k8s-gcr-io-freeze-announcement/)
+- Typo on Tempo Helm chart version variable name.
+- Typo on Tempo priority class name set value.
 
 ## [4.6.0] - 2023-02-23
 

README.md

@@ -367,6 +367,7 @@ module "eks_main" {
 | grafana\_ingress\_class\_name | ingress className | `string` | `nginx` | no |
 | grafana\_persistence\_enabled | Persistent volume | `bool` | `false` | no |
 | grafana\_priority\_class\_name | allows you to set a priority class | `string` | `""` | no |
+| k8s\_image\_registry | Kubernetes image registry. | `string` | `registry.k8s.io` | no |
 
 ## Outputs
 

helm.tf

@@ -14,6 +14,11 @@ resource "helm_release" "ingress_nginx" {
     file("${path.module}/helm-values/ingress-nginx.yaml")
   ]
 
+  set {
+    name  = "controller.image.registry"
+    value = var.k8s_image_registry
+  }
+
   set {
     name  = "controller.metrics.enabled"
     value = var.ingress_service_monitor_enabled
@@ -66,6 +71,11 @@ resource "helm_release" "ingress_nginx_additional" {
     file("${path.module}/helm-values/ingress-nginx-additional.yaml")
   ]
 
+  set {
+    name  = "controller.image.registry"
+    value = var.k8s_image_registry
+  }
+
   set {
     name  = "controller.metrics.enabled"
     value = var.ingress_service_monitor_enabled
@@ -114,6 +124,11 @@ resource "helm_release" "cluster_autoscaler" {
   chart      = "cluster-autoscaler"
   version    = var.cluster_autoscaler_chart_version
 
+  set {
+    name  = "image.repository"
+    value = "${var.k8s_image_registry}/autoscaling/cluster-autoscaler"
+  }
+
   set {
     name  = "autoDiscovery.clusterName"
     value = var.cluster_name
@@ -197,6 +212,17 @@ resource "helm_release" "prometheus_stack" {
   dependency_update = true
   timeout           = 600
 
+
+  set {
+    name = "kube-state-metrics.image.repository"
+    value = "${var.k8s_image_registry}/kube-state-metrics/kube-state-metrics"
+  }
+
+  set {
+    name = "prometheusOperator.admissionWebhooks.patch.image.repository"
+    value = "${var.k8s_image_registry}/ingress-nginx/kube-webhook-certgen"
+  }
+
   set {
     name = "prometheus.prometheusSpec.additionalScrapeConfigs"
     value = var.prometheus_additional_scrape_configs
@@ -866,7 +892,7 @@ resource "helm_release" "tempo_distributed" {
   create_namespace  = true
   repository        = "https://grafana.github.io/helm-charts"
   chart             = "tempo-distributed"
-  version           = var.tempo_chart_versoin
+  version           = var.tempo_chart_version
   dependency_update = true
   timeout           = 600
 
@@ -875,7 +901,7 @@ resource "helm_release" "tempo_distributed" {
   ]
 
   set {
-    name = "prometheus_priority_class_name"
+    name = "global.priorityClassName"
     value = var.tempo_priority_class_name
   }
 

nodegroups.tf

@@ -35,11 +35,9 @@ locals {
 resource "aws_key_pair" "eks" {
   key_name   = aws_eks_cluster.main.name
   public_key = base64decode(aws_ssm_parameter.eks_public_key.value)
-  tags = var.eks_tags
+  tags       = var.eks_tags
 }
 
-
-
 resource "aws_launch_template" "eks_node_groups" {
   for_each                              = merge(local.custom_node_groups, local.managed_node_groups)
   name                                  = each.key
@@ -140,7 +138,6 @@ resource "aws_autoscaling_group" "eks" {
     }
   }
 
-
   lifecycle {
     ignore_changes = [desired_capacity]
   }

variables.tf

@@ -119,7 +119,9 @@ variable "eks_addons" {
 }
 
 # ============================== helm releases ============================== #
-
+variable "k8s_image_registry" {
+    default = "registry.k8s.io"
+}
 # ================== ingress-nginx =================
 variable "helm_ingress_nginx_enabled" {
     default = false
@@ -238,7 +240,7 @@ variable "loki_chart_version" {
     default = "0.48.3"  
 }
 
-variable "loki_priorityclass" {
+variable "loki_priority_class_name" {
     default = ""
 }
 
@@ -573,13 +575,12 @@ variable "helm_tempo_enabled" {
     default = false
 }
 
-variable "tempo_chart_versoin" {
+variable "tempo_chart_version" {
     default = "0.17.1"  
 }
 
 variable "tempo_priority_class_name" {
     default = null
-
 }
 
 # tempo - compactor