Skip to content

Commit e87eef8

Browse files
committed
autoscaler support for sa on 1.24
Signed-off-by: junior <junior@users.noreply.github.com>
1 parent 943c289 commit e87eef8

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

modules/oke-cluster-autoscaler/main.tf

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,21 @@ 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"
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"
4646

47-
# count = local.cluster_autoscaler_enabled ? 1 : 0
48-
# }
47+
depends_on = [kubernetes_service_account.cluster_autoscaler_sa]
48+
49+
count = local.cluster_autoscaler_enabled ? 1 : 0
50+
}
4951
resource "kubernetes_cluster_role" "cluster_autoscaler_cr" {
5052
metadata {
5153
name = "cluster-autoscaler"

modules/oke-cluster-autoscaler/variables.tf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ variable "oke_node_pools" {
2222
type = list(any)
2323

2424
default = []
25-
description = "Node pools (id, min_nodes, max_nodes) to use with Cluster Autoscaler"
25+
description = "Node pools (id, min_nodes, max_nodes, k8s_version) to use with Cluster Autoscaler"
2626
}
27-
# variable "k8s_version" {
28-
# default = "Latest"
29-
# description = "Kubernetes version installed on your worker nodes"
30-
# }
3127

3228
# OCI Provider
3329
variable "region" {}

0 commit comments

Comments
 (0)