From cb4f59cba27ce29fb9658e7e56b1dc066811f7d0 Mon Sep 17 00:00:00 2001 From: Jiaxin Shan Date: Sat, 6 Feb 2021 22:13:42 -0800 Subject: [PATCH] Update kubemark setup guidance --- .../hollow-node_simplified_template.yaml | 31 +++++++++---------- .../sig-scalability/kubemark-setup-guide.md | 3 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/contributors/devel/sig-scalability/hollow-node_simplified_template.yaml b/contributors/devel/sig-scalability/hollow-node_simplified_template.yaml index 8d33982e6..1b9315ad7 100644 --- a/contributors/devel/sig-scalability/hollow-node_simplified_template.yaml +++ b/contributors/devel/sig-scalability/hollow-node_simplified_template.yaml @@ -33,19 +33,18 @@ spec: - containerPort: 10250 - containerPort: 10255 env: - - name: CONTENT_TYPE - valueFrom: - configMapKeyRef: - name: node-configmap - key: content.type - name: NODE_NAME valueFrom: fieldRef: fieldPath: metadata.name command: - - /bin/sh - - -c - - /kubemark --morph=kubelet --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubelet.kubeconfig $(CONTENT_TYPE) --alsologtostderr --v=2 + - /kubemark + args: + - --morph=kubelet + - --name=$(NODE_NAME) + - --kubeconfig=/kubeconfig/kubelet.kubeconfig + - --alsologtostderr + - --v=2 volumeMounts: - name: kubeconfig-volume mountPath: /kubeconfig @@ -61,19 +60,19 @@ spec: - name: hollow-proxy image: {{kubemark_image_registry}}/kubemark:{{kubemark_image_tag}} env: - - name: CONTENT_TYPE - valueFrom: - configMapKeyRef: - name: node-configmap - key: content.type - name: NODE_NAME valueFrom: fieldRef: fieldPath: metadata.name command: - - /bin/sh - - -c - - /kubemark --morph=proxy --name=$(NODE_NAME) --use-real-proxier=false --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --alsologtostderr --v=2 + - /kubemark + args: + - --morph=proxy + - --name=$(NODE_NAME) + - --use-real-proxier=false + - --kubeconfig=/kubeconfig/kubeproxy.kubeconfig + - --alsologtostderr + - --v=2 volumeMounts: - name: kubeconfig-volume mountPath: /kubeconfig diff --git a/contributors/devel/sig-scalability/kubemark-setup-guide.md b/contributors/devel/sig-scalability/kubemark-setup-guide.md index f2f5a81f7..cdac20058 100644 --- a/contributors/devel/sig-scalability/kubemark-setup-guide.md +++ b/contributors/devel/sig-scalability/kubemark-setup-guide.md @@ -46,13 +46,12 @@ docker push {{kubemark_image_registry}}/kubemark:{{kubemark_image_tag}} 2. Create hollow nodes -- i. create namespace, configmap and secret +- i. create namespace and secret Copy kubemark master's kubeconfig which is used to configure access, put it on a master of external cluster, rename it as config. ``` kubectl create ns kubemark -kubectl create configmap node-configmap -n kubemark --from-literal=content.type="test-cluster" kubectl create secret generic kubeconfig --type=Opaque --namespace=kubemark --from-file=kubelet.kubeconfig=config --from-file=kubeproxy.kubeconfig=config ```