Skip to content

K
k3s
Commit e752f214 authored by Matt Margolin's avatar Matt Margolin Committed by Justin Santa Barbara
Browse files
Options

Enable non_masquerade_cidr option configured in salt.grains

This should allow allow the non_masquerade_cidr option to get configured in /etc/salt/minion.d/grains.conf, allowing the flag to used by kubelet in /etc/sysconfig/kubelet. Default configuration is set in pillar
parent 73017b6d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
cluster/gce/configure-vm.sh
View file @ e752f214
......@@ -414,6 +414,7 @@ instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
node_instance_prefix: '$(echo "$NODE_INSTANCE_PREFIX" | sed -e "s/'/''/g")'
cluster_cidr: '$(echo "$CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
allocate_node_cidrs: '$(echo "$ALLOCATE_NODE_CIDRS" | sed -e "s/'/''/g")'
non_masquerade_cidr: '$(echo "$NON_MASQUERADE_CIDR" | sed -e "s/'/''/g")'
service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")'
enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")'
......
cluster/saltbase/salt/kubelet/default
View file @ e752f214
......@@ -88,8 +88,8 @@
{% endif -%}
{% set non_masquerade_cidr = "" -%}
{% if grains.non_masquerade_cidr is defined -%}
{% set non_masquerade_cidr = "--non-masquerade-cidr=" + grains.non_masquerade_cidr -%}
{% if pillar.get('non_masquerade_cidr','') is defined -%}
{% set non_masquerade_cidr = "--non-masquerade-cidr=" + pillar.non_masquerade_cidr -%}
{% endif -%}
# The master kubelet cannot wait for the flannel daemon because it is responsible
......
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