Merge pull request #14639 from gmarek/hollow-proxy

Auto commit by PR queue bot

test/kubemark/common.sh

@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source "${KUBE_ROOT}/cluster/kubemark/util.sh"
 source "${KUBE_ROOT}/cluster/kubemark/config-default.sh"
+source "${KUBE_ROOT}/cluster/kubemark/util.sh"
 
 detect-project &> /dev/null
 export PROJECT

test/kubemark/hollow-node_template.json

@@ -2,20 +2,20 @@
 	"kind": "ReplicationController",
 	"apiVersion": "v1",
 	"metadata": {
-		"name": "hollow-kubelet",
+		"name": "hollow-node",
 		"labels": {
-			"name": "hollow-kubelet"
+			"name": "hollow-node"
 		}
 	},
 	"spec": {
 		"replicas": ##numreplicas##,
 		"selector": {
-			"name": "hollow-kubelet"
+			"name": "hollow-node"
 		},
 		"template": {
 		  "metadata": {
 				"labels": {
-					"name": "hollow-kubelet"
+					"name": "hollow-node"
 				}
 			},
 			"spec": {
@@ -27,7 +27,8 @@
 						}
 					}
 				],
-				"containers": [{
+				"containers": [
+				{
 					"name": "hollow-kubelet",
 					"image": "gcr.io/##project##/kubemark:latest",
 					"ports": [
@@ -39,7 +40,8 @@
 						"./kubemark.sh"
 					],
 					"args": [
-						"--v=3"
+						"--v=3",
+						"--morph=kubelet"
 					],
 					"volumeMounts": [
 						{
@@ -53,6 +55,30 @@
 							"memory": "100M"
 						}
 					}
+
+				},
+				{
+					"name": "hollow-proxy",
+					"image": "gcr.io/##project##/kubemark:latest",
+					"command": [
+						"./kubemark.sh"
+					],
+					"args": [
+						"--v=3",
+						"--morph=proxy"
+					],
+					"volumeMounts": [
+						{
+							"name": "kubeconfig-volume",
+							"mountPath": "/kubeconfig"
+						}
+					],
+					"resources": {
+						"requests": {
+							"cpu": "20m",
+							"memory": "100M"
+						}
+					}
 				}]
 			}
 		}

test/kubemark/start-kubemark.sh

@@ -200,11 +200,11 @@ contexts:
 current-context: kubemark-context
 EOF
 
-sed "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json
-sed -i'' -e "s/##project##/${PROJECT}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json
+sed "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-node_template.json > ${KUBE_ROOT}/test/kubemark/hollow-node.json
+sed -i'' -e "s/##project##/${PROJECT}/g" ${KUBE_ROOT}/test/kubemark/hollow-node.json
 kubectl create -f ${KUBE_ROOT}/test/kubemark/kubemark-ns.json
 kubectl create -f ${KUBECONFIG_SECRET} --namespace="kubemark"
-kubectl create -f ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json --namespace="kubemark"
+kubectl create -f ${KUBE_ROOT}/test/kubemark/hollow-node.json --namespace="kubemark"
 
 rm ${KUBECONFIG_SECRET}