Skip to content

Commit 110af3c

Browse files
committed
workaround for autoscaler 1.24
Signed-off-by: junior <junior@users.noreply.github.com>
1 parent 20764b3 commit 110af3c

File tree

1 file changed

+15
-2
lines changed
  • modules/oke-cluster-autoscaler

1 file changed

+15
-2
lines changed

modules/oke-cluster-autoscaler/main.tf

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
locals {
6-
cluster_autoscaler_supported_k8s_versions = { "1.21" = "1.21.1-3", "1.22" = "1.22.2-4", "1.23" = "1.23.0-4" } # There's no API to get that list. Need to be updated manually
6+
cluster_autoscaler_supported_k8s_versions = { "1.21" = "1.21.1-3", "1.22" = "1.22.2-4", "1.23" = "1.23.0-4", "1.24" = "1.23.0-4" } # There's no API to get that list. Need to be updated manually
77
cluster_autoscaler_image_version = lookup(local.cluster_autoscaler_supported_k8s_versions, local.k8s_major_minor_version, reverse(values(local.cluster_autoscaler_supported_k8s_versions))[0])
88
cluster_autoscaler_default_region = "us-ashburn-1"
99
cluster_autoscaler_image_regions = ["us-ashburn-1", "us-phoenix-1", "uk-london-1", "eu-frankfurt-1"]
@@ -19,7 +19,7 @@ locals {
1919
k8s_major_minor_version = regex("\\d+(?:\\.(?:\\d+|x)(?:))", var.oke_node_pools.0.node_k8s_version)
2020
}
2121

22-
# NOTE: Service Account creation is not supported with Kubernetes 1.24 and Terraform Kubernetes provider 2.12.1.
22+
# NOTE: Service Account Terraform resource is not supported with Kubernetes 1.24.
2323
resource "kubernetes_service_account" "cluster_autoscaler_sa" {
2424
metadata {
2525
name = "cluster-autoscaler"
@@ -33,6 +33,19 @@ resource "kubernetes_service_account" "cluster_autoscaler_sa" {
3333

3434
count = local.cluster_autoscaler_enabled ? 1 : 0
3535
}
36+
# resource "kubernetes_secret" "cluster_autoscaler_sa_secret" {
37+
# metadata {
38+
# name = "cluster-autoscaler-token-secret"
39+
# namespace = "kube-system"
40+
# annotations = {
41+
# "kubernetes.io/service-account.name" = "cluster-autoscaler"
42+
# "kubernetes.io/service-account.namespace" = "kube-system"
43+
# }
44+
# }
45+
# type = "kubernetes.io/service-account-token"
46+
47+
# count = local.cluster_autoscaler_enabled ? 1 : 0
48+
# }
3649
resource "kubernetes_cluster_role" "cluster_autoscaler_cr" {
3750
metadata {
3851
name = "cluster-autoscaler"

0 commit comments

Comments
 (0)