Merge pull request #27924 from kubernetes/revert-27840-add-sources-to…

…-node Automatic merge from submit-queue Revert "Copy and display source location prominently on Kubernetes instances" Reverts #27840 This broke cluster upgrade, ref #27764 (comment). cc @janetkuo @zmerlynn
kubernetes · Jun 23, 2016 · 11fdfb5 · 11fdfb5
2 parents ec6bfc2 + 56d4586
commit 11fdfb5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 17 deletions.
diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh
@@ -106,9 +106,7 @@ Welcome to Kubernetes ${version}!
 You can find documentation for Kubernetes at:
   http://docs.kubernetes.io/
 
-The source for this release can be found at:
-  /usr/local/share/doc/kubernetes/kubernetes-src.tar.gz
-Or you can download it at:
+You can download the build image for this release at:
   https://storage.googleapis.com/kubernetes-release/release/${version}/kubernetes-src.tar.gz
 
 It is based on the Kubernetes source at:

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
@@ -910,9 +910,7 @@ Welcome to Kubernetes ${version}!
 You can find documentation for Kubernetes at:
   http://docs.kubernetes.io/
 
-The source for this release can be found at:
-  /home/kubernetes/kubernetes-src.tar.gz
-Or you can download it at:
+You can download the build image for this release at:
   https://storage.googleapis.com/kubernetes-release/release/${version}/kubernetes-src.tar.gz
 
 It is based on the Kubernetes source at:

diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
@@ -158,9 +158,6 @@ function install-kube-binary-config {
   fi
 
   cp "${KUBE_HOME}/kubernetes/LICENSES" "${KUBE_HOME}"
-  cp "${KUBE_HOME}/kubernetes/kubernetes-src.tar.gz" "${KUBE_HOME}"
-  chmod a+r "${KUBE_HOME}/kubernetes/LICENSES"
-  chmod a+r "${KUBE_HOME}/kubernetes/kubernetes-src.tar.gz"
 
   # Put kube-system pods manifests in ${KUBE_HOME}/kube-manifests/.
   dst_dir="${KUBE_HOME}/kube-manifests"

diff --git a/cluster/saltbase/install.sh b/cluster/saltbase/install.sh
@@ -68,7 +68,6 @@ mkdir -p /srv/salt-new/salt/kube-bins
 mkdir -p /srv/salt-new/salt/kube-docs
 cp -v "${KUBE_TEMP}/kubernetes/server/bin/"* /srv/salt-new/salt/kube-bins/
 cp -v "${KUBE_TEMP}/kubernetes/LICENSES" /srv/salt-new/salt/kube-docs/
-cp -v "${KUBE_TEMP}/kubernetes/kubernetes-src.tar.gz" /srv/salt-new/salt/kube-docs/
 
 kube_bin_dir="/srv/salt-new/salt/kube-bins";
 docker_images_sls_file="/srv/salt-new/pillar/docker-images.sls";

diff --git a/cluster/saltbase/salt/base.sls b/cluster/saltbase/salt/base.sls
@@ -50,10 +50,3 @@ net.ipv4.neigh.default.gc_thresh1:
     - user: root
     - group: root
     - mode: 644
-
-/usr/local/share/doc/kubernetes/kubernetes-src.tar.gz:
-  file.managed:
-    - source: salt://kube-docs/kubernetes-src.tar.gz
-    - user: root
-    - group: root
-    - mode: 644