Merge pull request #23250 from huggsboson/patch-1

Automatic merge from submit-queue Use kube-system namespace Fixes #23153. Sadly, kube-system isn't automatically created, so people need to make sure to create it in their turnup scripts. Also after creating kube-system it can take 10+ seconds for master and proxy to show up. I tested the equivalent of these changes locally, but not these changes themselves as I don't have a dev/build env up, so please read carefully and maybe try them out!

Merge pull request #23250 from huggsboson/patch-1
1cd93cb1 · k8s-merge-robot · b04f6ffc · 99c79d1c · 1cd93cb1 · 1cd93cb1
Commit 1cd93cb1 authored Apr 25, 2016 by k8s-merge-robot
5 changed files
--- a/cluster/images/hyperkube/etcd.json
+++ b/cluster/images/hyperkube/etcd.json
 {
  "apiVersion": "v1",
  "kind": "Pod",
-  "metadata": {"name":"k8s-etcd"},
+  "metadata": {
+    "name": "k8s-etcd",
+    "namespace": "kube-system"
+  },
  "spec": {
    "hostNetwork": true,
    "containers": [

--- a/cluster/images/hyperkube/kube-proxy.json
+++ b/cluster/images/hyperkube/kube-proxy.json
 {
  "apiVersion": "v1",
  "kind": "Pod",
-  "metadata": {"name":"k8s-proxy"},
+  "metadata": {
+    "name": "k8s-proxy",
+    "namespace": "kube-system"
+  },
  "spec": {
    "hostNetwork": true,
    "containers": [

--- a/cluster/images/hyperkube/master-multi.json
+++ b/cluster/images/hyperkube/master-multi.json
 {
 "apiVersion": "v1",
 "kind": "Pod",
-"metadata": {"name":"k8s-master"},
+"metadata": {
+  "name": "k8s-master",
+  "namespace": "kube-system"
+},
 "spec":{
  "hostNetwork": true,
  "containers":[

--- a/cluster/images/hyperkube/master.json
+++ b/cluster/images/hyperkube/master.json
 {
 "apiVersion": "v1",
 "kind": "Pod",
-"metadata": {"name":"k8s-master"},
+"metadata": {
+  "name": "k8s-master",
+  "namespace": "kube-system"
+},
 "spec":{
  "hostNetwork": true,
  "containers":[

--- a/cluster/images/hyperkube/turnup.sh
+++ b/cluster/images/hyperkube/turnup.sh
@@ -20,7 +20,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
-K8S_VERSION=${K8S_VERSION:-"1.2.0-alpha.7"}
+K8S_VERSION=${K8S_VERSION:-"1.2.0"}
 docker run \
  --volume=/:/rootfs:ro \
@@ -41,3 +41,9 @@ docker run \
    --cluster-dns=10.0.0.10 \
    --cluster-domain=cluster.local \
    --allow-privileged=true --v=2
+until $(kubectl cluster-info &> /dev/null); do
+    sleep 1
+done
+kubectl create ns kube-system