mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Configure pod priority for kube-proxy when enabled
This commit is contained in:
		@@ -24,6 +24,7 @@ spec:
 | 
				
			|||||||
      annotations:
 | 
					      annotations:
 | 
				
			||||||
        scheduler.alpha.kubernetes.io/critical-pod: ''
 | 
					        scheduler.alpha.kubernetes.io/critical-pod: ''
 | 
				
			||||||
    spec:
 | 
					    spec:
 | 
				
			||||||
 | 
					      {{pod_priority}}
 | 
				
			||||||
      hostNetwork: true
 | 
					      hostNetwork: true
 | 
				
			||||||
      nodeSelector:
 | 
					      nodeSelector:
 | 
				
			||||||
        beta.kubernetes.io/kube-proxy-ds-ready: "true"
 | 
					        beta.kubernetes.io/kube-proxy-ds-ready: "true"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -735,6 +735,10 @@ function prepare-kube-proxy-manifest-variables {
 | 
				
			|||||||
    kube_cache_mutation_detector_env_name="- name: KUBE_CACHE_MUTATION_DETECTOR"
 | 
					    kube_cache_mutation_detector_env_name="- name: KUBE_CACHE_MUTATION_DETECTOR"
 | 
				
			||||||
    kube_cache_mutation_detector_env_value="value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
 | 
					    kube_cache_mutation_detector_env_value="value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					  local pod_priority=""
 | 
				
			||||||
 | 
					  if [[ "${ENABLE_POD_PRIORITY}" == "true" ]]; then
 | 
				
			||||||
 | 
					    pod_priority="priorityClassName: system-node-critical"
 | 
				
			||||||
 | 
					  fi
 | 
				
			||||||
  sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" ${src_file}
 | 
					  sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file}
 | 
					  sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{pillar\['kube-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file}
 | 
					  sed -i -e "s@{{pillar\['kube-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file}
 | 
				
			||||||
@@ -742,6 +746,7 @@ function prepare-kube-proxy-manifest-variables {
 | 
				
			|||||||
  sed -i -e "s@{{container_env}}@${container_env}@g" ${src_file}
 | 
					  sed -i -e "s@{{container_env}}@${container_env}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{kube_cache_mutation_detector_env_name}}@${kube_cache_mutation_detector_env_name}@g" ${src_file}
 | 
					  sed -i -e "s@{{kube_cache_mutation_detector_env_name}}@${kube_cache_mutation_detector_env_name}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{kube_cache_mutation_detector_env_value}}@${kube_cache_mutation_detector_env_value}@g" ${src_file}
 | 
					  sed -i -e "s@{{kube_cache_mutation_detector_env_value}}@${kube_cache_mutation_detector_env_value}@g" ${src_file}
 | 
				
			||||||
 | 
					  sed -i -e "s@{{pod_priority}}@${pod_priority}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{ cpurequest }}@100m@g" ${src_file}
 | 
					  sed -i -e "s@{{ cpurequest }}@100m@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" ${src_file}
 | 
					  sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" ${src_file}
 | 
				
			||||||
  if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then
 | 
					  if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1071,6 +1071,10 @@ function prepare-kube-proxy-manifest-variables {
 | 
				
			|||||||
    kube_cache_mutation_detector_env_name="- name: KUBE_CACHE_MUTATION_DETECTOR"
 | 
					    kube_cache_mutation_detector_env_name="- name: KUBE_CACHE_MUTATION_DETECTOR"
 | 
				
			||||||
    kube_cache_mutation_detector_env_value="value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
 | 
					    kube_cache_mutation_detector_env_value="value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					  local pod_priority=""
 | 
				
			||||||
 | 
					  if [[ "${ENABLE_POD_PRIORITY}" == "true" ]]; then
 | 
				
			||||||
 | 
					    pod_priority="priorityClassName: system-node-critical"
 | 
				
			||||||
 | 
					  fi
 | 
				
			||||||
  sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" ${src_file}
 | 
					  sed -i -e "s@{{kubeconfig}}@${kubeconfig}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file}
 | 
					  sed -i -e "s@{{pillar\['kube_docker_registry'\]}}@${kube_docker_registry}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{pillar\['kube-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file}
 | 
					  sed -i -e "s@{{pillar\['kube-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file}
 | 
				
			||||||
@@ -1078,6 +1082,7 @@ function prepare-kube-proxy-manifest-variables {
 | 
				
			|||||||
  sed -i -e "s@{{container_env}}@${container_env}@g" ${src_file}
 | 
					  sed -i -e "s@{{container_env}}@${container_env}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{kube_cache_mutation_detector_env_name}}@${kube_cache_mutation_detector_env_name}@g" ${src_file}
 | 
					  sed -i -e "s@{{kube_cache_mutation_detector_env_name}}@${kube_cache_mutation_detector_env_name}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{kube_cache_mutation_detector_env_value}}@${kube_cache_mutation_detector_env_value}@g" ${src_file}
 | 
					  sed -i -e "s@{{kube_cache_mutation_detector_env_value}}@${kube_cache_mutation_detector_env_value}@g" ${src_file}
 | 
				
			||||||
 | 
					  sed -i -e "s@{{pod_priority}}@${pod_priority}@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{ cpurequest }}@100m@g" ${src_file}
 | 
					  sed -i -e "s@{{ cpurequest }}@100m@g" ${src_file}
 | 
				
			||||||
  sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" ${src_file}
 | 
					  sed -i -e "s@{{api_servers_with_port}}@${api_servers}@g" ${src_file}
 | 
				
			||||||
  if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then
 | 
					  if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,6 +34,11 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
{% set throttles = "--iptables-sync-period=1m --iptables-min-sync-period=10s" -%}
 | 
					{% set throttles = "--iptables-sync-period=1m --iptables-min-sync-period=10s" -%}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					{% set pod_priority = "" -%}
 | 
				
			||||||
 | 
					{% if pillar.get('enable_pod_priority', '').lower() == 'true' -%}
 | 
				
			||||||
 | 
					  {% set pod_priority = "priorityClassName: system-node-critical" -%}
 | 
				
			||||||
 | 
					{% endif -%}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# test_args should always go last to overwrite prior configuration
 | 
					# test_args should always go last to overwrite prior configuration
 | 
				
			||||||
{% set params = log_level + " " + throttles + " " + feature_gates + " " + test_args -%}
 | 
					{% set params = log_level + " " + throttles + " " + feature_gates + " " + test_args -%}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -58,6 +63,7 @@ metadata:
 | 
				
			|||||||
    tier: node
 | 
					    tier: node
 | 
				
			||||||
    component: kube-proxy
 | 
					    component: kube-proxy
 | 
				
			||||||
spec:
 | 
					spec:
 | 
				
			||||||
 | 
					  {{pod_priority}}
 | 
				
			||||||
  hostNetwork: true
 | 
					  hostNetwork: true
 | 
				
			||||||
  initContainers:
 | 
					  initContainers:
 | 
				
			||||||
  - name: touch-lock
 | 
					  - name: touch-lock
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user