diff --git a/test/kubemark/resources/hollow-node_template.json b/test/kubemark/resources/hollow-node_template.json index 86ca15a38fc..b23614b3945 100644 --- a/test/kubemark/resources/hollow-node_template.json +++ b/test/kubemark/resources/hollow-node_template.json @@ -36,12 +36,24 @@ {"containerPort": 10250}, {"containerPort": 10255} ], + "env": [ + { + "name": "CONTENT_TYPE", + "valueFrom": { + "configMapKeyRef": { + "name": "node-configmap", + "key": "content.type" + } + } + } + ], "command": [ "./kubemark.sh" ], "args": [ "--v=3", - "--morph=kubelet" + "--morph=kubelet", + "$(CONTENT_TYPE)" ], "volumeMounts": [ { @@ -60,12 +72,24 @@ { "name": "hollow-proxy", "image": "gcr.io/##project##/kubemark:latest", + "env": [ + { + "name": "CONTENT_TYPE", + "valueFrom": { + "configMapKeyRef": { + "name": "node-configmap", + "key": "content.type" + } + } + } + ], "command": [ "./kubemark.sh" ], "args": [ "--v=3", - "--morph=proxy" + "--morph=proxy", + "$(CONTENT_TYPE)" ], "volumeMounts": [ { diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 0efb2ba140c..d10a639dc57 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -207,6 +207,20 @@ cat > "${KUBECONFIG_SECRET}" << EOF } EOF +NODE_CONFIGMAP="${RESOURCE_DIRECTORY}/node_config_map.json" +cat > "${NODE_CONFIGMAP}" << EOF +{ + "apiVersion": "v1", + "kind": "ConfigMap", + "metadata": { + "name": "node-configmap" + }, + "data": { + "content.type": "${TEST_CLUSTER_API_CONTENT_TYPE}" + } +} +EOF + LOCAL_KUBECONFIG="${RESOURCE_DIRECTORY}/kubeconfig.loc" cat > "${LOCAL_KUBECONFIG}" << EOF apiVersion: v1 @@ -247,10 +261,12 @@ sed -i'' -e "s/##EVENTER_MEM##/${eventer_mem}/g" "${RESOURCE_DIRECTORY}/addons/h "${KUBECTL}" create -f "${RESOURCE_DIRECTORY}/kubemark-ns.json" "${KUBECTL}" create -f "${KUBECONFIG_SECRET}" --namespace="kubemark" +"${KUBECTL}" create -f "${NODE_CONFIGMAP}" --namespace="kubemark" "${KUBECTL}" create -f "${RESOURCE_DIRECTORY}/addons" --namespace="kubemark" "${KUBECTL}" create -f "${RESOURCE_DIRECTORY}/hollow-node.json" --namespace="kubemark" rm "${KUBECONFIG_SECRET}" +rm "${NODE_CONFIGMAP}" echo "Waiting for all HollowNodes to become Running..." start=$(date +%s)