mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Allow the lifecycle of kube-proxy to be managed independently of the startup scripts for GCE
Introduces a new env variable KUBE_PROXY_DISABLE which causes the configure scripts to skip over the creation of both static pods as well as daemonset addons for kube-proxy. When false, the behavior falls back to the default today, which is to rely on the value of KUBE_PROXY_DAEMONSET to decide whether to start static pods on the nodes or an addon on the master.
This commit is contained in:
parent
3783e03dc9
commit
04a51cac17
@ -483,6 +483,13 @@ ENABLE_PROMETHEUS_TO_SD="${ENABLE_PROMETHEUS_TO_SD:-false}"
|
|||||||
# Optional: [Experiment Only] Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
|
# Optional: [Experiment Only] Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
|
||||||
KUBE_PROXY_DAEMONSET="${KUBE_PROXY_DAEMONSET:-false}" # true, false
|
KUBE_PROXY_DAEMONSET="${KUBE_PROXY_DAEMONSET:-false}" # true, false
|
||||||
|
|
||||||
|
# Control whether the startup scripts manage the lifecycle of kube-proxy
|
||||||
|
# When true, the startup scripts do not enable kube-proxy either as a daemonset addon or as a static pod
|
||||||
|
# regardless of the value of KUBE_PROXY_DAEMONSET.
|
||||||
|
# When false, the value of KUBE_PROXY_DAEMONSET controls whether kube-proxy comes up as a static pod or
|
||||||
|
# as an addon daemonset.
|
||||||
|
KUBE_PROXY_DISABLE="${KUBE_PROXY_DISABLE:-false}" # true, false
|
||||||
|
|
||||||
# Optional: duration of cluster signed certificates.
|
# Optional: duration of cluster signed certificates.
|
||||||
CLUSTER_SIGNING_DURATION="${CLUSTER_SIGNING_DURATION:-}"
|
CLUSTER_SIGNING_DURATION="${CLUSTER_SIGNING_DURATION:-}"
|
||||||
|
|
||||||
|
@ -525,6 +525,13 @@ ENABLE_PROMETHEUS_TO_SD=${ENABLE_PROMETHEUS_TO_SD:-true}
|
|||||||
# Optional: [Experiment Only] Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
|
# Optional: [Experiment Only] Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
|
||||||
KUBE_PROXY_DAEMONSET=${KUBE_PROXY_DAEMONSET:-false} # true, false
|
KUBE_PROXY_DAEMONSET=${KUBE_PROXY_DAEMONSET:-false} # true, false
|
||||||
|
|
||||||
|
# Control whether the startup scripts manage the lifecycle of kube-proxy
|
||||||
|
# When true, the startup scripts do not enable kube-proxy either as a daemonset addon or as a static pod
|
||||||
|
# regardless of the value of KUBE_PROXY_DAEMONSET.
|
||||||
|
# When false, the value of KUBE_PROXY_DAEMONSET controls whether kube-proxy comes up as a static pod or
|
||||||
|
# as an addon daemonset.
|
||||||
|
KUBE_PROXY_DISABLE="${KUBE_PROXY_DISABLE:-false}" # true, false
|
||||||
|
|
||||||
# Optional: Change the kube-proxy implementation. Choices are [iptables, ipvs].
|
# Optional: Change the kube-proxy implementation. Choices are [iptables, ipvs].
|
||||||
KUBE_PROXY_MODE=${KUBE_PROXY_MODE:-iptables}
|
KUBE_PROXY_MODE=${KUBE_PROXY_MODE:-iptables}
|
||||||
|
|
||||||
|
@ -2519,7 +2519,7 @@ function start-kube-addons {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Set up manifests of other addons.
|
# Set up manifests of other addons.
|
||||||
if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]]; then
|
if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" ]] && [[ "${KUBE_PROXY_DISABLE:-}" != "true" ]]; then
|
||||||
if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then
|
if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then
|
||||||
# Replace with custom GKE kube proxy.
|
# Replace with custom GKE kube proxy.
|
||||||
cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF
|
cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF
|
||||||
@ -3027,7 +3027,7 @@ function main() {
|
|||||||
else
|
else
|
||||||
create-node-pki
|
create-node-pki
|
||||||
create-kubelet-kubeconfig "${KUBERNETES_MASTER_NAME}"
|
create-kubelet-kubeconfig "${KUBERNETES_MASTER_NAME}"
|
||||||
if [[ "${KUBE_PROXY_DAEMONSET:-}" != "true" ]]; then
|
if [[ "${KUBE_PROXY_DAEMONSET:-}" != "true" ]] && [[ "${KUBE_PROXY_DISABLE:-}" != "true" ]]; then
|
||||||
create-kubeproxy-user-kubeconfig
|
create-kubeproxy-user-kubeconfig
|
||||||
fi
|
fi
|
||||||
if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "standalone" ]]; then
|
if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "standalone" ]]; then
|
||||||
@ -3072,7 +3072,7 @@ function main() {
|
|||||||
start-lb-controller
|
start-lb-controller
|
||||||
update-legacy-addon-node-labels &
|
update-legacy-addon-node-labels &
|
||||||
else
|
else
|
||||||
if [[ "${KUBE_PROXY_DAEMONSET:-}" != "true" ]]; then
|
if [[ "${KUBE_PROXY_DAEMONSET:-}" != "true" ]] && [[ "${KUBE_PROXY_DISABLE:-}" != "true" ]]; then
|
||||||
start-kube-proxy
|
start-kube-proxy
|
||||||
fi
|
fi
|
||||||
if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "standalone" ]]; then
|
if [[ "${ENABLE_NODE_PROBLEM_DETECTOR:-}" == "standalone" ]]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user