github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26621 from liyimeng/kolla-k8s

Browse Source 
Automatic merge from submit-queue

Fix the problem in building hyperkube for 3rd party registry

Minor bugfix.  fixes #26620



[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot 2016-06-04 04:23:31 -07:00
commit 57125d81e1
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/images/hyperkube/Makefile
View File

@ -60,6 +60,7 @@ endif
cp ../../../_output/dockerized/bin/linux/${ARCH}/hyperkube ${TEMP_DIR} 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|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|${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|ARCH|${QEMUARCH}|g" Dockerfile
cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile

2
cluster/images/hyperkube/addons/kube-proxy.yaml
View File

@ -32,7 +32,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-proxy - name: kube-proxy
image: gcr.io/google_containers/hyperkube-ARCH:VERSION image: REGISTRY/hyperkube-ARCH:VERSION
command: command:
- /hyperkube - /hyperkube
- proxy - proxy

2
cluster/images/hyperkube/static-pods/addon-manager.json
View File

@ -28,7 +28,7 @@
}, },
{ {
"name": "kube-addon-manager-data", "name": "kube-addon-manager-data",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/copy-addons.sh" "/copy-addons.sh"
], ],

8
cluster/images/hyperkube/static-pods/master-multi.json
View File

@ -10,7 +10,7 @@
"containers":[ "containers":[
{ {
"name": "controller-manager", "name": "controller-manager",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/hyperkube", "/hyperkube",
"controller-manager", "controller-manager",
@ -29,7 +29,7 @@
}, },
{ {
"name": "apiserver", "name": "apiserver",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/hyperkube", "/hyperkube",
"apiserver", "apiserver",
@ -55,7 +55,7 @@
}, },
{ {
"name": "scheduler", "name": "scheduler",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/hyperkube", "/hyperkube",
"scheduler", "scheduler",
@ -65,7 +65,7 @@
}, },
{ {
"name": "setup", "name": "setup",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/setup-files.sh", "/setup-files.sh",
"IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local" "IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"

8
cluster/images/hyperkube/static-pods/master.json
View File

@ -10,7 +10,7 @@
"containers":[ "containers":[
{ {
"name": "controller-manager", "name": "controller-manager",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/hyperkube", "/hyperkube",
"controller-manager", "controller-manager",
@ -29,7 +29,7 @@
}, },
{ {
"name": "apiserver", "name": "apiserver",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/hyperkube", "/hyperkube",
"apiserver", "apiserver",
@ -55,7 +55,7 @@
}, },
{ {
"name": "scheduler", "name": "scheduler",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/hyperkube", "/hyperkube",
"scheduler", "scheduler",
@ -65,7 +65,7 @@
}, },
{ {
"name": "setup", "name": "setup",
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION", "image": "REGISTRY/hyperkube-ARCH:VERSION",
"command": [ "command": [
"/setup-files.sh", "/setup-files.sh",
"IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local" "IP:10.0.0.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"

7
hack/dev-push-hyperkube.sh
View File

@ -17,7 +17,12 @@
# This script will build the hyperkube image and push it to the repository # 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 # 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. # 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 errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail