Merge pull request #98911 from Jeffwan/jiaxin/update_kubemark_args

Remove CONTENT_TYPE in kubemark hollow template

cluster/kubemark/gce/config-default.sh

@@ -37,9 +37,6 @@ NUM_WINDOWS_NODES=${KUBEMARK_NUM_WINDOWS_NODES:-0}
 HOLLOW_KUBELET_TEST_LOG_LEVEL="${HOLLOW_KUBELET_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
 HOLLOW_PROXY_TEST_LOG_LEVEL="${HOLLOW_PROXY_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
 
-# ContentType used by all components to communicate with apiserver.
-TEST_CLUSTER_API_CONTENT_TYPE="${TEST_CLUSTER_API_CONTENT_TYPE:-}"
-
 # Hollow-node components' test arguments.
 HOLLOW_KUBELET_TEST_ARGS="${HOLLOW_KUBELET_TEST_ARGS:-} ${HOLLOW_KUBELET_TEST_LOG_LEVEL}"
 HOLLOW_PROXY_TEST_ARGS="${HOLLOW_PROXY_TEST_ARGS:-} ${HOLLOW_PROXY_TEST_LOG_LEVEL}"

cluster/kubemark/pre-existing/config-default.sh

@@ -32,7 +32,6 @@ PROJECT="${PROJECT:-}"
 
 NUM_NODES="${NUM_NODES:-1}"
 
-TEST_CLUSTER_API_CONTENT_TYPE="${TEST_CLUSTER_API_CONTENT_TYPE:-}"
 KUBELET_TEST_LOG_LEVEL="${KUBELET_TEST_LOG_LEVEL:-}"
 KUBEPROXY_TEST_LOG_LEVEL="${KUBEPROXY_TEST_LOG_LEVEL:-}"
 MASTER_NAME="${MASTER_NAME:-}"

test/kubemark/iks/startup.sh

@@ -174,7 +174,6 @@ EOF
   "${KUBECTL}" create -f "${RESOURCE_DIRECTORY}/kubemark-ns.json"
   # Create configmap for configuring hollow- kubelet, proxy and npd.
   "${KUBECTL}" create configmap "node-configmap" --namespace="kubemark" \
-    --from-literal=content.type="${TEST_CLUSTER_API_CONTENT_TYPE}" \
     --from-file=kernel.monitor="${RESOURCE_DIRECTORY}/kernel-monitor.json"
 
   # Create secret for passing kubeconfigs to kubelet, kubeproxy and npd.

test/kubemark/iks/util.sh

@@ -177,7 +177,6 @@ function complete-login {
 # Generate values to fill the hollow-node configuration templates.
 # Exported variables:
 #   KUBECTL - The name or path to the kubernetes client binary.
-#   TEST_CLUSTER_API_CONTENT_TYPE - Defines the content-type of the requests used by the Kubemark components.
 function generate-values {
 	echo "Generating values"
 	master-config
@@ -185,8 +184,6 @@ function generate-values {
 	export KUBECTL
 	KUBEMARK_DIRECTORY="${KUBE_ROOT}/test/kubemark"
 	RESOURCE_DIRECTORY="${KUBEMARK_DIRECTORY}/resources"
-	TEST_CLUSTER_API_CONTENT_TYPE="bluemix" #Determine correct usage of this
-	export TEST_CLUSTER_API_CONTENT_TYPE
 	CONFIGPATH=${KUBECONFIG%/*}
 	KUBELET_CERT_BASE64="${KUBELET_CERT_BASE64:-$(base64 "${CONFIGPATH}/admin.pem" | tr -d '\r\n')}"
 	KUBELET_KEY_BASE64="${KUBELET_KEY_BASE64:-$(base64 "${CONFIGPATH}/admin-key.pem" | tr -d '\r\n')}"

test/kubemark/resources/hollow-node_template.yaml

@@ -44,11 +44,6 @@ spec:
         - containerPort: 10250
         - containerPort: 10255
         env:
-        - name: CONTENT_TYPE
-          valueFrom:
-            configMapKeyRef:
-              name: node-configmap
-              key: content.type
         - name: NODE_NAME
           valueFrom:
             fieldRef:
@@ -58,7 +53,6 @@ spec:
           "--morph=kubelet",
           "--name=$(NODE_NAME)",
           "--kubeconfig=/kubeconfig/kubelet.kubeconfig",
-          "$(CONTENT_TYPE)",
           "--log-file=/var/log/kubelet-$(NODE_NAME).log",
           "--logtostderr=false",
           "--node-labels={{hollow_node_labels}}",
@@ -81,11 +75,6 @@ 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:
@@ -95,7 +84,6 @@ spec:
           "--morph=proxy",
           "--name=$(NODE_NAME)",
           "--kubeconfig=/kubeconfig/kubeproxy.kubeconfig",
-          "$(CONTENT_TYPE)",
           "--log-file=/var/log/kubeproxy-$(NODE_NAME).log",
           "--logtostderr=false",
           {{hollow_proxy_params}}

test/kubemark/start-kubemark.sh

@@ -90,7 +90,6 @@ function create-kube-hollow-node-resources {
 
   # Create configmap for configuring hollow- kubelet, proxy and npd.
   "${KUBECTL}" create configmap "node-configmap" --namespace="kubemark" \
-    --from-literal=content.type="${TEST_CLUSTER_API_CONTENT_TYPE}" \
     --from-file=kernel.monitor="${RESOURCE_DIRECTORY}/kernel-monitor.json"
 
   # Create secret for passing kubeconfigs to kubelet, kubeproxy and npd.