Skip to content

Commit

Permalink
all corrections, but without the suggested removed changes due to PR171
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvveen committed Jan 9, 2025
1 parent ad0f34c commit f036276
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
19 changes: 7 additions & 12 deletions 00-locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,17 @@ locals {
id = var.cluster_id,
clusterName = var.cluster_name,
apiServer = {
extraArgs = {
cloud-provider = "external"
enable-admission-plugins = "MutatingAdmissionWebhook,ValidatingAdmissionWebhook, ServiceAccount"
},
certSANs = [
module.elb_k8s_elb.elb_dns_name,
]
],
extraArgs = {
enable-admission-plugins = var.admission_plugins
}
},
controllerManager = {
extraArgs = {
allocate-node-cidrs = var.allocate_node_cidrs
cloud-provider = "external"
leader-elect = true
}
},
network = {
Expand Down Expand Up @@ -77,8 +75,7 @@ locals {
}
}

# Used to configure Cilium Kube-Proxy replacement

# Used to configure Cilium Kube-Proxy replacement
config_cilium_patch = {
cluster = {
proxy = {
Expand All @@ -94,10 +91,8 @@ locals {
}
}
}



config_patches_common = [

config_patches_common = [
for path in var.config_patch_files : file(path)
]

Expand Down
6 changes: 6 additions & 0 deletions 00-variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,10 @@ variable "config_patch_files" {
default = []
description = "Path to talos config path files that applies to all nodes"
type = list(string)
}

variable "admission_plugins" {
description = "List of admission plugins to enable"
type = list(string)
default = ["MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ServiceAccount"]
}

0 comments on commit f036276

Please sign in to comment.