github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setting kubemark node labels

Browse Source
This commit is contained in:
Krzysztof Siedlecki
2019-11-28 10:36:56 +01:00
parent 7ed5eb6dcc
commit aacd79cc36
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/kubemark/gce/util.sh
View File

@@ -107,3 +107,7 @@ function delete-kubemark-master {
"${KUBE_ROOT}/hack/e2e-internal/e2e-down.sh" "${KUBE_ROOT}/hack/e2e-internal/e2e-down.sh"
) )
} }
function calculate-node-labels {
echo "cloud.google.com/metadata-proxy-ready=true"
}

1
test/kubemark/resources/hollow-node_template.yaml
View File

@@ -58,6 +58,7 @@ spec:
"$(CONTENT_TYPE)", "$(CONTENT_TYPE)",
"--log-file=/var/log/kubelet-$(NODE_NAME).log", "--log-file=/var/log/kubelet-$(NODE_NAME).log",
"--logtostderr=false", "--logtostderr=false",
"--node-labels={{hollow_node_labels}}",
{{hollow_kubelet_params}} {{hollow_kubelet_params}}
] ]
volumeMounts: volumeMounts:

5
test/kubemark/skeleton/util.sh
View File

@@ -35,6 +35,11 @@ function delete-kubemark-master {
echo "Deleting cluster..." echo "Deleting cluster..."
} }
# This function should return node labels.
function calculate-node-labels {
echo ""
}
# Common colors used throughout the kubemark scripts # Common colors used throughout the kubemark scripts
if [[ -z "${color_start-}" ]]; then if [[ -z "${color_start-}" ]]; then
declare -r color_start="\033[" declare -r color_start="\033["

2
test/kubemark/start-kubemark.sh
View File

@@ -152,6 +152,7 @@ function create-kube-hollow-node-resources {
proxy_cpu=${KUBEMARK_HOLLOW_PROXY_MILLICPU:-$proxy_cpu} proxy_cpu=${KUBEMARK_HOLLOW_PROXY_MILLICPU:-$proxy_cpu}
proxy_mem_per_node=${KUBEMARK_HOLLOW_PROXY_MEM_PER_NODE_KB:-50} proxy_mem_per_node=${KUBEMARK_HOLLOW_PROXY_MEM_PER_NODE_KB:-50}
proxy_mem=$((100 * 1024 + proxy_mem_per_node*NUM_NODES)) proxy_mem=$((100 * 1024 + proxy_mem_per_node*NUM_NODES))
hollow_node_labels=${HOLLOW_NODE_LABELS:-$(calculate-node-labels)}
hollow_kubelet_params=$(eval "for param in ${HOLLOW_KUBELET_TEST_ARGS:-}; do echo -n \\\"\$param\\\",; done") hollow_kubelet_params=$(eval "for param in ${HOLLOW_KUBELET_TEST_ARGS:-}; do echo -n \\\"\$param\\\",; done")
hollow_kubelet_params=${hollow_kubelet_params%?} hollow_kubelet_params=${hollow_kubelet_params%?}
hollow_proxy_params=$(eval "for param in ${HOLLOW_PROXY_TEST_ARGS:-}; do echo -n \\\"\$param\\\",; done") hollow_proxy_params=$(eval "for param in ${HOLLOW_PROXY_TEST_ARGS:-}; do echo -n \\\"\$param\\\",; done")
@@ -166,6 +167,7 @@ function create-kube-hollow-node-resources {
sed -i'' -e "s@{{kubemark_image_registry}}@${KUBEMARK_IMAGE_REGISTRY}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s@{{kubemark_image_registry}}@${KUBEMARK_IMAGE_REGISTRY}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s@{{kubemark_image_tag}}@${KUBEMARK_IMAGE_TAG}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s@{{kubemark_image_tag}}@${KUBEMARK_IMAGE_TAG}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s@{{master_ip}}@${MASTER_IP}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s@{{master_ip}}@${MASTER_IP}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s@{{hollow_node_labels}}@${hollow_node_labels}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s@{{hollow_kubelet_params}}@${hollow_kubelet_params}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s@{{hollow_kubelet_params}}@${hollow_kubelet_params}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s@{{hollow_proxy_params}}@${hollow_proxy_params}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s@{{hollow_proxy_params}}@${hollow_proxy_params}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"
sed -i'' -e "s@{{kubemark_mig_config}}@${KUBEMARK_MIG_CONFIG:-}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml" sed -i'' -e "s@{{kubemark_mig_config}}@${KUBEMARK_MIG_CONFIG:-}@g" "${RESOURCE_DIRECTORY}/hollow-node.yaml"