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

Revert kube-proxy as a DaemonSet in hyperkube for the v1.3 release

Browse Source
This commit is contained in:
Lucas Käldström 2016-06-22 00:48:46 +03:00
parent f32d23ad73
commit ca3ee9e5a1
5 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/images/hyperkube/Dockerfile
View File

@ -43,10 +43,16 @@ COPY static-pods/master.json /etc/kubernetes/manifests/
COPY static-pods/etcd.json /etc/kubernetes/manifests/ COPY static-pods/etcd.json /etc/kubernetes/manifests/
COPY static-pods/addon-manager.json /etc/kubernetes/manifests/ COPY static-pods/addon-manager.json /etc/kubernetes/manifests/
# TODO: Move out kube-proxy to a DaemonSet again
COPY static-pods/kube-proxy.json /etc/kubernetes/manifests/
# Manifests for the docker-multinode guide # Manifests for the docker-multinode guide
COPY static-pods/master-multi.json /etc/kubernetes/manifests-multi/ COPY static-pods/master-multi.json /etc/kubernetes/manifests-multi/
COPY static-pods/addon-manager.json /etc/kubernetes/manifests-multi/ COPY static-pods/addon-manager.json /etc/kubernetes/manifests-multi/
# TODO: Move out kube-proxy to a DaemonSet again
COPY static-pods/kube-proxy.json /etc/kubernetes/manifests-multi/
# Copy over all addons # Copy over all addons
COPY addons /etc/kubernetes/addons COPY addons /etc/kubernetes/addons

4
cluster/images/hyperkube/Makefile
View File

@ -61,7 +61,9 @@ endif
cp ../../saltbase/salt/kube-dns/skydns-svc.yaml.base ${TEMP_DIR}/addons/skydns-svc.yaml cp ../../saltbase/salt/kube-dns/skydns-svc.yaml.base ${TEMP_DIR}/addons/skydns-svc.yaml
cp ../../addons/dashboard/dashboard-controller.yaml ${TEMP_DIR}/addons cp ../../addons/dashboard/dashboard-controller.yaml ${TEMP_DIR}/addons
cp ../../addons/dashboard/dashboard-service.yaml ${TEMP_DIR}/addons cp ../../addons/dashboard/dashboard-service.yaml ${TEMP_DIR}/addons
cp kube-proxy-ds.yaml ${TEMP_DIR}/addons/kube-proxy.yaml
# TODO: Move out kube-proxy to a DaemonSet again
#cp kube-proxy-ds.yaml ${TEMP_DIR}/addons/kube-proxy.yaml
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

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

@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# TODO: Move out kube-proxy to a DaemonSet again
# This is disabled for the v1.3 release, due to bootstrapping complexities
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:

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

@ -11,7 +11,7 @@
"containers": [ "containers": [
{ {
"name": "kube-addon-manager", "name": "kube-addon-manager",
"image": "gcr.io/google-containers/kube-addon-manager-ARCH:v3", "image": "gcr.io/google-containers/kube-addon-manager-ARCH:v4",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "5m", "cpu": "5m",

27
cluster/images/hyperkube/static-pods/kube-proxy.json Normal file
View File

@ -0,0 +1,27 @@
{
"apiVersion": "v1",
"kind": "Pod",
"metadata": {
"name": "k8s-proxy",
"namespace": "kube-system"
},
"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
}
}
]
}
}