mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #68492 from vishh/68372
Fix node label assignment for GCE k8s clusters.
This commit is contained in:
commit
9dc5bb56a6
@ -55,9 +55,6 @@ NODE_LOCAL_SSDS_EXT=${NODE_LOCAL_SSDS_EXT:-}
|
|||||||
NODE_ACCELERATORS=${NODE_ACCELERATORS:-""}
|
NODE_ACCELERATORS=${NODE_ACCELERATORS:-""}
|
||||||
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
|
REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
|
||||||
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
|
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
|
||||||
if [[ "${PREEMPTIBLE_NODE}" == "true" ]]; then
|
|
||||||
NODE_LABELS="${NODE_LABELS},cloud.google.com/gke-preemptible=true"
|
|
||||||
fi
|
|
||||||
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
|
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
|
||||||
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
|
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
|
||||||
KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-} # default value calculated below
|
KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-} # default value calculated below
|
||||||
@ -177,6 +174,12 @@ HEAPSTER_MACHINE_TYPE="${HEAPSTER_MACHINE_TYPE:-}"
|
|||||||
# NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes.
|
# NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes.
|
||||||
NON_MASTER_NODE_LABELS="${KUBE_NON_MASTER_NODE_LABELS:-}"
|
NON_MASTER_NODE_LABELS="${KUBE_NON_MASTER_NODE_LABELS:-}"
|
||||||
|
|
||||||
|
if [[ "${PREEMPTIBLE_MASTER}" == "true" ]]; then
|
||||||
|
NODE_LABELS="${NODE_LABELS},cloud.google.com/gke-preemptible=true"
|
||||||
|
elif [[ "${PREEMPTIBLE_NODE}" == "true" ]]; then
|
||||||
|
NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS},cloud.google.com/gke-preemptible=true"
|
||||||
|
fi
|
||||||
|
|
||||||
# To avoid running Calico on a node that is not configured appropriately,
|
# To avoid running Calico on a node that is not configured appropriately,
|
||||||
# label each Node so that the DaemonSet can run the Pods only on ready Nodes.
|
# label each Node so that the DaemonSet can run the Pods only on ready Nodes.
|
||||||
if [[ ${NETWORK_POLICY_PROVIDER:-} == "calico" ]]; then
|
if [[ ${NETWORK_POLICY_PROVIDER:-} == "calico" ]]; then
|
||||||
@ -253,7 +256,7 @@ FEATURE_GATES="${KUBE_FEATURE_GATES:-ExperimentalCriticalPodAnnotation=true}"
|
|||||||
if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
|
if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
|
||||||
FEATURE_GATES="${FEATURE_GATES},DevicePlugins=true"
|
FEATURE_GATES="${FEATURE_GATES},DevicePlugins=true"
|
||||||
if [[ "${NODE_ACCELERATORS}" =~ .*type=([a-zA-Z0-9-]+).* ]]; then
|
if [[ "${NODE_ACCELERATORS}" =~ .*type=([a-zA-Z0-9-]+).* ]]; then
|
||||||
NODE_LABELS="${NODE_LABELS},cloud.google.com/gke-accelerator=${BASH_REMATCH[1]}"
|
NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS},cloud.google.com/gke-accelerator=${BASH_REMATCH[1]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -55,9 +55,6 @@ REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-true}
|
|||||||
KUBE_APISERVER_REQUEST_TIMEOUT=300
|
KUBE_APISERVER_REQUEST_TIMEOUT=300
|
||||||
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
|
PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}
|
||||||
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
|
PREEMPTIBLE_MASTER=${PREEMPTIBLE_MASTER:-false}
|
||||||
if [[ "${PREEMPTIBLE_NODE}" == "true" ]]; then
|
|
||||||
NODE_LABELS="${NODE_LABELS},cloud.google.com/gke-preemptible=true"
|
|
||||||
fi
|
|
||||||
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
|
KUBE_DELETE_NODES=${KUBE_DELETE_NODES:-true}
|
||||||
KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true}
|
KUBE_DELETE_NETWORK=${KUBE_DELETE_NETWORK:-true}
|
||||||
CREATE_CUSTOM_NETWORK=${CREATE_CUSTOM_NETWORK:-false}
|
CREATE_CUSTOM_NETWORK=${CREATE_CUSTOM_NETWORK:-false}
|
||||||
@ -215,6 +212,12 @@ KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}"
|
|||||||
# NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes.
|
# NON_MASTER_NODE_LABELS are labels will only be applied on non-master nodes.
|
||||||
NON_MASTER_NODE_LABELS="${KUBE_NON_MASTER_NODE_LABELS:-}"
|
NON_MASTER_NODE_LABELS="${KUBE_NON_MASTER_NODE_LABELS:-}"
|
||||||
|
|
||||||
|
if [[ "${PREEMPTIBLE_MASTER}" == "true" ]]; then
|
||||||
|
NODE_LABELS="${NODE_LABELS},cloud.google.com/gke-preemptible=true"
|
||||||
|
elif [[ "${PREEMPTIBLE_NODE}" == "true" ]]; then
|
||||||
|
NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS},cloud.google.com/gke-preemptible=true"
|
||||||
|
fi
|
||||||
|
|
||||||
# Optional: Enable netd.
|
# Optional: Enable netd.
|
||||||
ENABLE_NETD="${KUBE_ENABLE_NETD:-false}"
|
ENABLE_NETD="${KUBE_ENABLE_NETD:-false}"
|
||||||
CUSTOM_NETD_YAML="${KUBE_CUSTOM_NETD_YAML:-}"
|
CUSTOM_NETD_YAML="${KUBE_CUSTOM_NETD_YAML:-}"
|
||||||
@ -260,7 +263,7 @@ fi
|
|||||||
if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
|
if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
|
||||||
FEATURE_GATES="${FEATURE_GATES},DevicePlugins=true"
|
FEATURE_GATES="${FEATURE_GATES},DevicePlugins=true"
|
||||||
if [[ "${NODE_ACCELERATORS}" =~ .*type=([a-zA-Z0-9-]+).* ]]; then
|
if [[ "${NODE_ACCELERATORS}" =~ .*type=([a-zA-Z0-9-]+).* ]]; then
|
||||||
NODE_LABELS="${NODE_LABELS},cloud.google.com/gke-accelerator=${BASH_REMATCH[1]}"
|
NON_MASTER_NODE_LABELS="${NON_MASTER_NODE_LABELS},cloud.google.com/gke-accelerator=${BASH_REMATCH[1]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user