From 0f1d5e6e36047f938ca06be1fc6b690278b259d6 Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Fri, 12 May 2017 13:47:13 +0200
Subject: [PATCH] Remove kubemark.sh as we don't use pod IP from it anymore

---
 cluster/images/kubemark/Dockerfile            |  3 ---
 cluster/images/kubemark/kubemark.sh           | 20 -------------------
 .../resources/hollow-node_template.yaml       |  4 ++--
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 cluster/images/kubemark/kubemark.sh

diff --git a/cluster/images/kubemark/Dockerfile b/cluster/images/kubemark/Dockerfile
index f4bcfa577c5..fb4f2873537 100644
--- a/cluster/images/kubemark/Dockerfile
+++ b/cluster/images/kubemark/Dockerfile
@@ -14,7 +14,4 @@
 
 FROM debian:jessie
 
-COPY kubemark.sh /kubemark.sh
-RUN chmod a+x /kubemark.sh
-
 COPY kubemark /kubemark
diff --git a/cluster/images/kubemark/kubemark.sh b/cluster/images/kubemark/kubemark.sh
deleted file mode 100644
index 9e9f22e00a3..00000000000
--- a/cluster/images/kubemark/kubemark.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Currently populating the Pod IP thought the downward API is broken (#13690)
-# this is a temporary workaround.
-# TODO: get rid of this script when downward API is fixed.
-./kubemark --name=`hostname -i` $@
diff --git a/test/kubemark/resources/hollow-node_template.yaml b/test/kubemark/resources/hollow-node_template.yaml
index 62d336c949a..a5b629df8d8 100644
--- a/test/kubemark/resources/hollow-node_template.yaml
+++ b/test/kubemark/resources/hollow-node_template.yaml
@@ -51,7 +51,7 @@ spec:
         command:
         - /bin/sh
         - -c
-        - ./kubemark.sh --morph=kubelet --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubelet.kubeconfig $(CONTENT_TYPE) --alsologtostderr {{kubelet_verbosity_level}} 1>>/var/log/kubelet-$(NODE_NAME).log 2>&1
+        - /kubemark --morph=kubelet --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubelet.kubeconfig $(CONTENT_TYPE) --alsologtostderr {{kubelet_verbosity_level}} 1>>/var/log/kubelet-$(NODE_NAME).log 2>&1
         volumeMounts:
         - name: kubeconfig-volume
           mountPath: /kubeconfig
@@ -79,7 +79,7 @@ spec:
         command:
         - /bin/sh
         - -c
-        - ./kubemark.sh --morph=proxy --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --alsologtostderr {{kubeproxy_verbosity_level}} 1>>/var/log/kubeproxy-$(NODE_NAME).log 2>&1
+        - /kubemark --morph=proxy --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --alsologtostderr {{kubeproxy_verbosity_level}} 1>>/var/log/kubeproxy-$(NODE_NAME).log 2>&1
         volumeMounts:
         - name: kubeconfig-volume
           mountPath: /kubeconfig