Skip to content

K
k3s
Commit 0b5a18fc authored by Maxwell Forbes's avatar Maxwell Forbes
Browse files
Options

Merge pull request #7876 from cjcullen/cbr0

Fix controller-manager manifest for providers that don't specify CLUSTER_IP_RANGE
parents f6b70294 f0c26052
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
View file @ 0b5a18fc
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{% if pillar['instance_prefix'] is defined -%} {% if pillar['instance_prefix'] is defined -%}
{% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%} {% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%}
{% endif -%} {% endif -%}
{% if pillar['cluster_cidr'] is defined -%} {% if pillar['cluster_cidr'] is defined and pillar['cluster_cidr'] != "" -%}
{% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%} {% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%}
{% endif -%} {% endif -%}
{% if pillar['allocate_node_cidrs'] is defined -%} {% if pillar['allocate_node_cidrs'] is defined -%}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment