Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the problem in building hyperkube for 3rd party registry #26621

Merged
merged 1 commit into from
Jun 4, 2016
Merged

Fix the problem in building hyperkube for 3rd party registry #26621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cluster/images/hyperkube/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ endif
cp ../../../_output/dockerized/bin/linux/${ARCH}/hyperkube ${TEMP_DIR}

cd ${TEMP_DIR} && sed -i.back "s|VERSION|${VERSION}|g" addons/*.yaml static-pods/*.json
cd ${TEMP_DIR} && sed -i.back "s|REGISTRY|${REGISTRY}|g" addons/*.yaml static-pods/*.json
cd ${TEMP_DIR} && sed -i.back "s|ARCH|${ARCH}|g" addons/*.yaml static-pods/*.json
cd ${TEMP_DIR} && sed -i.back "s|ARCH|${QEMUARCH}|g" Dockerfile
cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/hyperkube/addons/kube-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
hostNetwork: true
containers:
- name: kube-proxy
image: gcr.io/google_containers/hyperkube-ARCH:VERSION
image: REGISTRY/hyperkube-ARCH:VERSION
command:
- /hyperkube
- proxy
Expand Down
2 changes: 1 addition & 1 deletion cluster/images/hyperkube/static-pods/addon-manager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
{
"name": "kube-addon-manager-data",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/copy-addons.sh"
],
Expand Down
8 changes: 4 additions & 4 deletions cluster/images/hyperkube/static-pods/master-multi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"containers":[
{
"name": "controller-manager",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/hyperkube",
"controller-manager",
Expand All @@ -29,7 +29,7 @@
},
{
"name": "apiserver",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/hyperkube",
"apiserver",
Expand All @@ -55,7 +55,7 @@
},
{
"name": "scheduler",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/hyperkube",
"scheduler",
Expand All @@ -65,7 +65,7 @@
},
{
"name": "setup",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/setup-files.sh",
"IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
Expand Down
8 changes: 4 additions & 4 deletions cluster/images/hyperkube/static-pods/master.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"containers":[
{
"name": "controller-manager",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/hyperkube",
"controller-manager",
Expand All @@ -29,7 +29,7 @@
},
{
"name": "apiserver",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/hyperkube",
"apiserver",
Expand All @@ -55,7 +55,7 @@
},
{
"name": "scheduler",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/hyperkube",
"scheduler",
Expand All @@ -65,7 +65,7 @@
},
{
"name": "setup",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
"image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [
"/setup-files.sh",
"IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
Expand Down
7 changes: 6 additions & 1 deletion hack/dev-push-hyperkube.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
# This script will build the hyperkube image and push it to the repository
# referred to by KUBE_DOCKER_REGISTRY and KUBE_DOCKER_OWNER. The image will
# be given a version tag with the value from KUBE_DOCKER_VERSION.

# e.g. run as:
# KUBE_DOCKER_REGISTRY=localhost:5000 KUBE_DOCKER_OWNER=liyi \
# KUBE_DOCKER_VERSION=1.3.0-dev ./hack/dev-push-hyperkube.sh
#
# will build image localhost:5000/liyi/hyperkube-amd64:1.3.0-dev

set -o errexit
set -o nounset
set -o pipefail
Expand Down