From 4b796c359ebcfaed7095431e8dd060389d9ce84c Mon Sep 17 00:00:00 2001 From: Jiaxin Shan Date: Tue, 9 Feb 2021 00:00:03 -0800 Subject: [PATCH] Remove CONTENT_TYPE in kubemark hollow template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CONTENT_TYPE in this case is `kube-api-content-type=application/vnd.kubernetes.protobuf` and it can be removed since we don’t see a need for setting it differently in the tests. Signed-off-by: Jiaxin Shan --- cluster/kubemark/gce/config-default.sh | 3 --- cluster/kubemark/pre-existing/config-default.sh | 1 - test/kubemark/iks/startup.sh | 1 - test/kubemark/iks/util.sh | 3 --- test/kubemark/resources/hollow-node_template.yaml | 12 ------------ test/kubemark/start-kubemark.sh | 1 - 6 files changed, 21 deletions(-) diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index c8fc31c8080..dc2bc027ed7 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/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}" diff --git a/cluster/kubemark/pre-existing/config-default.sh b/cluster/kubemark/pre-existing/config-default.sh index 5463564edfb..df5ae84c401 100644 --- a/cluster/kubemark/pre-existing/config-default.sh +++ b/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:-}" diff --git a/test/kubemark/iks/startup.sh b/test/kubemark/iks/startup.sh index 27a152a6ef7..a330aa91e61 100644 --- a/test/kubemark/iks/startup.sh +++ b/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. diff --git a/test/kubemark/iks/util.sh b/test/kubemark/iks/util.sh index b8f74dffb0a..554095888a5 100644 --- a/test/kubemark/iks/util.sh +++ b/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')}" diff --git a/test/kubemark/resources/hollow-node_template.yaml b/test/kubemark/resources/hollow-node_template.yaml index 7eeee9f9260..1f00e8016bc 100644 --- a/test/kubemark/resources/hollow-node_template.yaml +++ b/test/kubemark/resources/hollow-node_template.yaml @@ -41,11 +41,6 @@ spec: - containerPort: 10250 - containerPort: 10255 env: - - name: CONTENT_TYPE - valueFrom: - configMapKeyRef: - name: node-configmap - key: content.type - name: NODE_NAME valueFrom: fieldRef: @@ -55,7 +50,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}}", @@ -76,11 +70,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: @@ -90,7 +79,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}} diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 348f95492e3..312b66cd415 100755 --- a/test/kubemark/start-kubemark.sh +++ b/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.