github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 01:23:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18351 from fgrzadkowski/simple_single_node

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-14 13:54:26 -08:00
parent 1ab03bea80 f2d56c4198
commit a702364470
9 changed files with 97 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/hyperkube/Dockerfile
View File

@@ -20,6 +20,8 @@ RUN chmod a+rx /hyperkube
COPY master-multi.json /etc/kubernetes/manifests-multi/master.json
COPY master.json /etc/kubernetes/manifests/master.json
COPY etcd.json /etc/kubernetes/manifests/etcd.json
COPY kube-proxy.json /etc/kubernetes/manifests/kube-proxy.json
COPY safe_format_and_mount /usr/share/google/safe_format_and_mount
RUN chmod a+rx /usr/share/google/safe_format_and_mount

21
cluster/images/hyperkube/Makefile
View File

@@ -9,19 +9,28 @@ BASEIMAGE=debian:jessie
# need to escape '/' for the regexp below
# BASEIMAGE=armbuild\\/debian:jessie
all:
all: build
build:
cp ../../saltbase/salt/helpers/safe_format_and_mount .
cp ../../saltbase/salt/generate-cert/make-ca-cert.sh .
curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/${ARCH}/hyperkube
sed -i "s/VERSION/${VERSION}/g" master-multi.json master.json
sed -i "s/ARCH/${ARCH}/g" master-multi.json master.json
sed -i "s/VERSION/${VERSION}/g" master-multi.json master.json kube-proxy.json
sed -i "s/ARCH/${ARCH}/g" master-multi.json master.json kube-proxy.json
sed -i "s/BASEIMAGE/${BASEIMAGE}/g" Dockerfile
docker build -t gcr.io/google_containers/hyperkube-${ARCH}:${VERSION} .
gcloud docker push gcr.io/google_containers/hyperkube-${ARCH}:${VERSION}
# Backward compatability. TODO: deprecate this image tag
ifeq ($(ARCH),amd64)
docker tag gcr.io/google_containers/hyperkube-${ARCH}:${VERSION} gcr.io/google_containers/hyperkube:${VERSION}
gcloud docker push gcr.io/google_containers/hyperkube:${VERSION}
docker tag -f gcr.io/google_containers/hyperkube-${ARCH}:${VERSION} gcr.io/google_containers/hyperkube:${VERSION}
endif
push: build
gcloud docker push gcr.io/google_containers/hyperkube-${ARCH}:${VERSION}
ifeq ($(ARCH),amd64)
gcloud docker push gcr.io/google_containers/hyperkube:${VERSION}
endif
clean:
rm -f safe_format_and_mount make-ca-cert.sh hyperkube
.PHONY: all

33
cluster/images/hyperkube/etcd.json Normal file
View File

@@ -0,0 +1,33 @@
{
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-etcd"},
"spec": {
"hostNetwork": true,
"containers": [
{
"name": "etcd",
"image": "gcr.io/google_containers/etcd:2.2.1",
"command": [
"/usr/local/bin/etcd",
"--listen-client-urls=http://127.0.0.1:4001",
"--advertise-client-urls=http://127.0.0.1:4001",
"--data-dir=/var/etcd/data"
],
"volumeMounts": [
{
"name": "varetcd",
"mountPath": "/var/etcd",
"readOnly": false
}
]
}
],
"volumes":[
{
"name": "varetcd",
"emptyDir": {}
}
]
}
}

24
cluster/images/hyperkube/kube-proxy.json Normal file
View File

@@ -0,0 +1,24 @@
{
"apiVersion": "v1",
"kind": "Pod",
"metadata": {"name":"k8s-proxy"},
"spec": {
"hostNetwork": true,
"containers": [
{
"name": "kube-proxy",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"command": [
"/hyperkube",
"proxy",
"--master=http://127.0.0.1:8080",
"--v=2",
"--resource-container=\"\""
],
"securityContext": {
"privileged": true
}
}
]
}
}

4
cluster/images/hyperkube/master.json
View File

@@ -41,7 +41,7 @@
"--tls-cert-file=/srv/kubernetes/server.cert",
"--tls-private-key-file=/srv/kubernetes/server.key",
"--token-auth-file=/srv/kubernetes/known_tokens.csv",
"--allow-privileged=True",
"--allow-privileged=true",
"--v=4"
],
"volumeMounts": [
@@ -63,7 +63,7 @@
},
{
"name": "setup",
"image": "gcr.io/google_containers/hyperkube:VERSION",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"command": [
"/setup-files.sh"
],

3
cluster/images/hyperkube/setup-files.sh
View File

@@ -31,7 +31,8 @@ create_token() {
echo "admin,admin,admin" > /data/basic_auth.csv
# Create HTTPS certificates
CERT_DIR=/data /make-ca-cert.sh $(hostname -i)
groupadd -f -r kube-cert-test
CERT_DIR=/data CERT_GROUP=kube-cert-test /make-ca-cert.sh $(hostname -i)
# Create known tokens for service accounts
echo "$(create_token),admin,admin" >> /data/known_tokens.csv

16
cluster/images/hyperkube/turnup.sh
View File

@@ -20,13 +20,7 @@ set -o errexit
set -o nounset
set -o pipefail
docker run --net=host -d gcr.io/google_containers/etcd:2.2.1 \
/usr/local/bin/etcd \
--addr=127.0.0.1:4001 \
--bind-addr=0.0.0.0:4001 \
--data-dir=/var/etcd/data
docker run --pid=host \
docker run \
--volume=/:/rootfs:ro \
--volume=/sys:/sys:ro \
--volume=/dev:/dev \
@@ -42,9 +36,5 @@ docker run --pid=host \
--hostname-override="127.0.0.1" \
--address="0.0.0.0" \
--api-servers=http://localhost:8080 \
--config=/etc/kubernetes/manifests --v=10
docker run -d --net=host --privileged \
gcr.io/google_containers/hyperkube:v${K8S_VERSION} \
/hyperkube proxy \
--master=http://127.0.0.1:8080 --v=2
--config=/etc/kubernetes/manifests \
--allow-privileged=true --v=10