Address 1st round reivew comments.

kubernetes · Aug 25, 2017 · 8f31a28 · 8f31a28
1 parent 89b6a2a
commit 8f31a28
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 22 deletions.
diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
@@ -48,6 +48,8 @@ spec:
         - -c
         - echo -998 > /proc/$$$/oom_score_adj && kube-proxy {{kubeconfig}} {{cluster_cidr}} --resource-container="" {{params}} 1>>/var/log/kube-proxy.log 2>&1
         {{container_env}}
+        {{kube_cache_mutation_detector_env_name}}
+          {{kube_cache_mutation_detector_env_value}}
         securityContext:
           privileged: true
         volumeMounts:

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
@@ -298,5 +298,6 @@ PROMETHEUS_TO_SD_ENDPOINT="${PROMETHEUS_TO_SD_ENDPOINT:-https://monitoring.googl
 PROMETHEUS_TO_SD_PREFIX="${PROMETHEUS_TO_SD_PREFIX:-custom.googleapis.com}"
 ENABLE_PROMETHEUS_TO_SD="${ENABLE_PROMETHEUS_TO_SD:-false}"
 
+# TODO(#51292): Make kube-proxy Daemonset default and remove the configuration here.
 # Optional: Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
 KUBE_PROXY_DAEMONSET="${KUBE_PROXY_DAEMONSET:-false}" # true, false
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
@@ -357,5 +357,6 @@ PROMETHEUS_TO_SD_ENDPOINT="${PROMETHEUS_TO_SD_ENDPOINT:-https://monitoring.googl
 PROMETHEUS_TO_SD_PREFIX="${PROMETHEUS_TO_SD_PREFIX:-custom.googleapis.com}"
 ENABLE_PROMETHEUS_TO_SD="${ENABLE_PROMETHEUS_TO_SD:-true}"
 
+# TODO(#51292): Make kube-proxy Daemonset default and remove the configuration here.
 # Optional: Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
 KUBE_PROXY_DAEMONSET="${KUBE_PROXY_DAEMONSET:-true}" # true, false
diff --git a/cluster/gce/container-linux/configure-helper.sh b/cluster/gce/container-linux/configure-helper.sh
@@ -710,10 +710,8 @@ function prepare-log-file {
 
 # Prepares parameters for kube-proxy manifest.
 # $1 source path of kube-proxy manifest.
-# $2 true for daemonset manifest; false for static pod. Default to false.
 function prepare-kube-proxy-manifest-variables {
   local -r src_file=$1;
-  local -r is_daemonset_manifest=${2:-false}
 
   remove-salt-config-comments "${src_file}"
 
@@ -733,19 +731,20 @@ function prepare-kube-proxy-manifest-variables {
     params+=" ${KUBEPROXY_TEST_ARGS}"
   fi
   local container_env=""
+  local kube_cache_mutation_detector_env_name=""
+  local kube_cache_mutation_detector_env_value=""
   if [[ -n "${ENABLE_CACHE_MUTATION_DETECTOR:-}" ]]; then
-    # Daemonset manifest needs a different indent.
-    if [ ${is_daemonset_manifest} = true ]; then
-      container_env="env:\n        - name: KUBE_CACHE_MUTATION_DETECTOR\n          value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
-    else
-      container_env="env:\n    - name: KUBE_CACHE_MUTATION_DETECTOR\n      value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
-    fi
+    container_env="env:"
+    kube_cache_mutation_detector_env_name="- name: KUBE_CACHE_MUTATION_DETECTOR"
+    kube_cache_mutation_detector_env_value="value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
   fi
   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-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file}
   sed -i -e "s@{{params}}@${params}@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_value}}@${kube_cache_mutation_detector_env_value}@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}
   if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then
@@ -764,9 +763,9 @@ function prepare-kube-proxy-manifest-variables {
   fi
 }
 
-# Starts kube-proxy pod.
+# Starts kube-proxy static pod.
 function start-kube-proxy {
-  echo "Start kube-proxy pod"
+  echo "Start kube-proxy static pod"
   prepare-log-file /var/log/kube-proxy.log
   local -r src_file="${KUBE_HOME}/kube-manifests/kubernetes/kube-proxy.manifest"
   prepare-kube-proxy-manifest-variables "$src_file"
@@ -1275,7 +1274,7 @@ function start-kube-addons {
 
   # Set up manifests of other addons.
   if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]]; then
-    prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml" true
+    prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml"
     setup-addon-manifests "addons" "kube-proxy"
   fi
   if [[ "${ENABLE_CLUSTER_MONITORING:-}" == "influxdb" ]] || \

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
@@ -1046,10 +1046,8 @@ function prepare-log-file {
 
 # Prepares parameters for kube-proxy manifest.
 # $1 source path of kube-proxy manifest.
-# $2 true for daemonset manifest; false for static pod. Default to false.
 function prepare-kube-proxy-manifest-variables {
   local -r src_file=$1;
-  local -r is_daemonset_manifest=${2:-false}
 
   remove-salt-config-comments "${src_file}"
 
@@ -1069,29 +1067,30 @@ function prepare-kube-proxy-manifest-variables {
     params+=" ${KUBEPROXY_TEST_ARGS}"
   fi
   local container_env=""
+  local kube_cache_mutation_detector_env_name=""
+  local kube_cache_mutation_detector_env_value=""
   if [[ -n "${ENABLE_CACHE_MUTATION_DETECTOR:-}" ]]; then
-    # Daemonset manifest needs a different indent.
-    if [ ${is_daemonset_manifest} = true ]; then
-      container_env="env:\n        - name: KUBE_CACHE_MUTATION_DETECTOR\n          value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
-    else
-      container_env="env:\n    - name: KUBE_CACHE_MUTATION_DETECTOR\n      value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
-    fi
+    container_env="env:"
+    kube_cache_mutation_detector_env_name="- name: KUBE_CACHE_MUTATION_DETECTOR"
+    kube_cache_mutation_detector_env_value="value: \"${ENABLE_CACHE_MUTATION_DETECTOR}\""
   fi
   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-proxy_docker_tag'\]}}@${kube_proxy_docker_tag}@g" ${src_file}
   sed -i -e "s@{{params}}@${params}@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_value}}@${kube_cache_mutation_detector_env_value}@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}
   if [[ -n "${CLUSTER_IP_RANGE:-}" ]]; then
     sed -i -e "s@{{cluster_cidr}}@--cluster-cidr=${CLUSTER_IP_RANGE}@g" ${src_file}
   fi
 }
 
-# Starts kube-proxy pod.
+# Starts kube-proxy static pod.
 function start-kube-proxy {
-  echo "Start kube-proxy pod"
+  echo "Start kube-proxy static pod"
   prepare-log-file /var/log/kube-proxy.log
   local -r src_file="${KUBE_HOME}/kube-manifests/kubernetes/kube-proxy.manifest"
   prepare-kube-proxy-manifest-variables "${src_file}"
@@ -1699,7 +1698,7 @@ function start-kube-addons {
 
   # Set up manifests of other addons.
   if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]]; then
-    prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml" true
+    prepare-kube-proxy-manifest-variables "$src_dir/kube-proxy/kube-proxy-ds.yaml"
     setup-addon-manifests "addons" "kube-proxy"
   fi
   if [[ "${ENABLE_CLUSTER_MONITORING:-}" == "influxdb" ]] || \

diff --git a/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest b/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest
@@ -38,6 +38,8 @@
 {% set params = log_level + " " + throttles + " " + feature_gates + " " + test_args -%}
 
 {% set container_env = "" -%}
+{% set kube_cache_mutation_detector_env_name = "" -%}
+{% set kube_cache_mutation_detector_env_value = "" -%}
 
 # kube-proxy podspec
 apiVersion: v1
@@ -78,6 +80,8 @@ spec:
     - -c
     - echo -998 > /proc/$$$/oom_score_adj && kube-proxy {{api_servers_with_port}} {{kubeconfig}} {{cluster_cidr}} --resource-container="" {{params}} 1>>/var/log/kube-proxy.log 2>&1
     {{container_env}}
+    {{kube_cache_mutation_detector_env_name}}
+      {{kube_cache_mutation_detector_env_value}}
     securityContext:
       privileged: true
     volumeMounts: