Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit 979a1ac

Browse files
author
Luke Addison
committed
Ensure asg name is defined
1 parent 6741bce commit 979a1ac

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

puppet/modules/kubernetes_addons/manifests/cluster_autoscaler.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
$rbac_enabled = false
2222
}
2323

24-
if defined('$kubernetes::cluster_name') {
24+
if defined('$kubernetes::cluster_name') and $instance_pool_name != '' {
2525
$asg_name="${::kubernetes::cluster_name}-kubernetes-${instance_pool_name}"
2626
} else {
27-
$asg_name=undef
27+
fail('asg name must be set')
2828
}
2929

3030
if $version == '' {

puppet/modules/kubernetes_addons/templates/cluster-autoscaler-deployment.yaml.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ spec:
6464
- --cloud-provider=<%= @cloud_provider %>
6565
- --skip-nodes-with-local-storage=false
6666
- --nodes=<%= @min_instances %>:<%= @max_instances %>:<%= @asg_name %>
67+
- --skip-nodes-with-system-pods=false
6768
<% if @balance_similar_node_groups -%>
6869
- --balance-similar-node-groups
6970
<% end -%>

0 commit comments

Comments
 (0)