Skip to content

Commit

Permalink
Merge pull request kubernetes#23250 from huggsboson/patch-1
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Use kube-system namespace

Fixes kubernetes#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!
  • Loading branch information
k8s-merge-robot committed Apr 26, 2016
2 parents b04f6ff + 99c79d1 commit 1cd93cb
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 5 deletions.
5 changes: 4 additions & 1 deletion cluster/images/hyperkube/etcd.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-etcd"},
"metadata": {
"name": "k8s-etcd",
"namespace": "kube-system"
},
"spec": {
"hostNetwork": true,
"containers": [
Expand Down
5 changes: 4 additions & 1 deletion cluster/images/hyperkube/kube-proxy.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-proxy"},
"metadata": {
"name": "k8s-proxy",
"namespace": "kube-system"
},
"spec": {
"hostNetwork": true,
"containers": [
Expand Down
5 changes: 4 additions & 1 deletion cluster/images/hyperkube/master-multi.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-master"},
"metadata": {
"name": "k8s-master",
"namespace": "kube-system"
},
"spec":{
"hostNetwork": true,
"containers":[
Expand Down
5 changes: 4 additions & 1 deletion cluster/images/hyperkube/master.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-master"},
"metadata": {
"name": "k8s-master",
"namespace": "kube-system"
},
"spec":{
"hostNetwork": true,
"containers":[
Expand Down
8 changes: 7 additions & 1 deletion cluster/images/hyperkube/turnup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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

0 comments on commit 1cd93cb

Please sign in to comment.