Revert "Rename package from kubernetes to k8s duet to bosh can't tell…

… packages"

This reverts commit 928d1dd.

jobs/apply-specs/templates/bin/deploy-specs.erb

@@ -5,7 +5,7 @@ set -e
 spec_dir="/var/vcap/jobs/apply-specs/specs"
 config_dir="/var/vcap/jobs/apply-specs/config"
 
-kubectl="/var/vcap/packages/k8s/bin/kubectl --kubeconfig=/var/vcap/jobs/apply-specs/config/kubeconfig"
+kubectl="/var/vcap/packages/kubernetes/bin/kubectl --kubeconfig=/var/vcap/jobs/apply-specs/config/kubeconfig"
 
 apply_spec() {
   local spec_file="${spec_dir}/${1}"

jobs/apply-specs/templates/bin/pre-start.erb

@@ -13,7 +13,7 @@ check_file_existence(){
 }
 
 main() {
-  check_file_existence "/var/vcap/packages/k8s/bin/kubectl"
+  check_file_existence "/var/vcap/packages/kubernetes/bin/kubectl"
 }
 
 main $@

jobs/kube-apiserver/templates/bin/pre-start.erb

@@ -13,7 +13,7 @@ check_file_existence(){
 }
 
 main() {
-  check_file_existence "/var/vcap/packages/k8s/bin/kube-apiserver"
+  check_file_existence "/var/vcap/packages/kubernetes/bin/kube-apiserver"
 }
 
 main $@

jobs/kube-apiserver/templates/config/bpm.yml.erb

@@ -20,7 +20,7 @@
 %>
 processes:
 - name: kube-apiserver
-  executable: /var/vcap/packages/k8s/bin/kube-apiserver
+  executable: /var/vcap/packages/kubernetes/bin/kube-apiserver
   limits:
     open_files: 65535
   args:

jobs/kube-controller-manager/templates/bin/pre-start.erb

@@ -13,7 +13,7 @@ check_file_existence(){
 }
 
 main() {
-  check_file_existence "/var/vcap/packages/k8s/bin/kube-controller-manager"
+  check_file_existence "/var/vcap/packages/kubernetes/bin/kube-controller-manager"
 }
 
 main $@

jobs/kube-controller-manager/templates/config/bpm.yml.erb

@@ -1,7 +1,7 @@
 ---
 processes:
 - name: kube-controller-manager
-  executable: /var/vcap/packages/k8s/bin/kube-controller-manager
+  executable: /var/vcap/packages/kubernetes/bin/kube-controller-manager
   args: 
   <% 
     if_p('k8s-args') do |args|

jobs/kube-proxy/templates/bin/kube_proxy_ctl.erb

@@ -2,7 +2,7 @@
 
 NAME="${0##*/}"
 
-export PATH=/var/vcap/packages/k8s/bin/:$PATH
+export PATH=/var/vcap/packages/kubernetes/bin/:$PATH
 
 RUN_DIR=/var/vcap/sys/run/kubernetes
 PIDFILE=$RUN_DIR/kube-proxy.pid

jobs/kube-proxy/templates/bin/pre-start.erb

@@ -23,7 +23,7 @@ check_directory_existence(){
 }
 
 main() {
-  check_file_existence "/var/vcap/packages/k8s/bin/kube-proxy"
+  check_file_existence "/var/vcap/packages/kubernetes/bin/kube-proxy"
   check_directory_existence "/var/vcap/packages/conntrack"
 }
 

jobs/kube-scheduler/templates/bin/pre-start.erb

@@ -13,7 +13,7 @@ check_file_existence(){
 }
 
 main() {
-  check_file_existence "/var/vcap/packages/k8s/bin/kube-scheduler"
+  check_file_existence "/var/vcap/packages/kubernetes/bin/kube-scheduler"
 }
 
 main $@

jobs/kube-scheduler/templates/config/bpm.yml.erb

@@ -1,7 +1,7 @@
 ---
 processes:
 - name: kube-scheduler
-  executable: /var/vcap/packages/k8s/bin/kube-scheduler
+  executable: /var/vcap/packages/kubernetes/bin/kube-scheduler
   args:
   <%
     if_p('k8s-args') do |args|

jobs/kubelet/templates/bin/drain.erb

@@ -5,7 +5,7 @@
 
 set -eu
 
-export PATH=/var/vcap/packages/k8s/bin:$PATH
+export PATH=/var/vcap/packages/kubernetes/bin:$PATH
 
 LOG_DIR=/var/vcap/sys/log/kubelet
 PIDFILE=/var/vcap/sys/run/kubernetes/kubelet.pid

jobs/kubelet/templates/bin/ensure_kubelet_up_and_running.erb

@@ -2,7 +2,7 @@
 
 [ -z "$DEBUG" ] || set -x
 
-kubectl="/var/vcap/packages/k8s/bin/kubectl --kubeconfig=/var/vcap/jobs/kubelet/config/kubeconfig"
+kubectl="/var/vcap/packages/kubernetes/bin/kubectl --kubeconfig=/var/vcap/jobs/kubelet/config/kubeconfig"
 
 # Wait for kubelet to become Ready before we move on to the next node.
 # Scheduling might not be enabled at this time.

jobs/kubelet/templates/bin/kubelet_ctl.erb

@@ -2,7 +2,7 @@
 
 NAME="${0##*/}"
 
-export PATH=/var/vcap/packages/k8s/bin/:/var/vcap/packages/docker/sbin/:/var/vcap/packages/socat/bin/:$PATH
+export PATH=/var/vcap/packages/kubernetes/bin/:/var/vcap/packages/docker/sbin/:/var/vcap/packages/socat/bin/:$PATH
 
 RUN_DIR=/var/vcap/sys/run/kubernetes
 PIDFILE=$RUN_DIR/kubelet.pid

jobs/kubelet/templates/bin/post-start.erb

@@ -3,10 +3,10 @@
 
 [ -z "$DEBUG" ] || set -x
 
-kubectl="/var/vcap/packages/k8s/bin/kubectl --kubeconfig=/var/vcap/jobs/kubelet/config/kubeconfig"
+kubectl="/var/vcap/packages/kubernetes/bin/kubectl --kubeconfig=/var/vcap/jobs/kubelet/config/kubeconfig"
 
 DOCKER_SOCKET=unix:///var/vcap/sys/run/docker/docker.sock
-CONTAINER_IMAGE_DIR=/var/vcap/packages/k8s/container-images
+CONTAINER_IMAGE_DIR=/var/vcap/packages/kubernetes/container-images
 ADDONS_CONTAINER_IMAGE_DIR=/var/vcap/packages/kubernetes-addons/container-images
 
 load_container() {

jobs/kubelet/templates/bin/pre-start.erb

@@ -23,8 +23,8 @@ check_directory_existence(){
 }
 
 main() {
-  check_file_existence "/var/vcap/packages/k8s/bin/kubelet"
-  check_directory_existence "/var/vcap/packages/k8s/container-images"
+  check_file_existence "/var/vcap/packages/kubernetes/bin/kubelet"
+  check_directory_existence "/var/vcap/packages/kubernetes/container-images"
   check_directory_existence "/var/vcap/packages/kubernetes-addons/container-images"
 }
 

jobs/kubernetes-roles/templates/bin/apply_policies.erb

@@ -4,7 +4,7 @@ set -e
 [ -z "$DEBUG" ] || set -x
 
 config_dir="/var/vcap/jobs/kubernetes-roles/config/"
-kubectl="/var/vcap/packages/k8s/bin/kubectl --kubeconfig=${config_dir}/kubeconfig"
+kubectl="/var/vcap/packages/kubernetes/bin/kubectl --kubeconfig=${config_dir}/kubeconfig"
 
 until ${kubectl} apply -f "${config_dir}/post-start-policies.yml"; do
  sleep 2

jobs/kubernetes-roles/templates/bin/pre-start.erb

@@ -13,7 +13,7 @@ check_file_existence(){
 }
 
 main() {
-  check_file_existence "/var/vcap/packages/k8s/bin/kubectl"
+  check_file_existence "/var/vcap/packages/kubernetes/bin/kubectl"
 }
 
 main $@

jobs/smoke-tests/templates/bin/run.erb

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-kubectl="/var/vcap/packages/k8s/bin/"
+kubectl="/var/vcap/packages/kubernetes/bin/"
 export PATH=${kubectl}:$PATH
 export KUBECONFIG="/var/vcap/jobs/smoke-tests/config/kubeconfig"