Compare commits

..

7 commits

Author SHA1 Message Date
Adam Miller
f4708a51d5 Bump RELEASE for automatic rebuild 2017-11-14 16:43:04 -06:00
Adam Miller
e019a59069 Bump RELEASE for automatic rebuild 2017-09-21 15:06:44 -05:00
Jason Brooks
9d71a24cf5 fix uid/gid 2017-09-05 11:45:04 -07:00
Adam Miller
52dd918025 Bump RELEASE for automatic rebuild 2017-08-24 18:00:57 -05:00
Jason Brooks
9bc0a89bb4 make init file executable 2017-08-16 21:23:57 -07:00
Jason Brooks
5af842367d don't sort args 2017-07-24 18:20:54 -07:00
Jason Brooks
61e2ca095b import from rawhide 2017-07-07 09:49:19 -07:00
3 changed files with 6 additions and 15 deletions

View file

@ -1,12 +1,13 @@
FROM registry.fedoraproject.org/kubernetes-master:rawhide FROM registry.fedoraproject.org/f26/kubernetes-node:latest
MAINTAINER "Jason Brooks" <jbrooks@redhat.com> MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
ENV container=docker ENV container=docker
ENV NAME=kubernetes-proxy VERSION=0 ARCH=x86_64 ENV NAME=kubernetes-proxy VERSION=0 RELEASE=5 ARCH=x86_64
LABEL BZComponent="$NAME" \ LABEL BZComponent="$NAME" \
name="$FGC/$NAME" \ name="$FGC/$NAME" \
version="$VERSION" \ version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \ architecture="$ARCH" \
atomic.type='system' atomic.type='system'

View file

@ -7,8 +7,8 @@
"process": { "process": {
"terminal": false, "terminal": false,
"user": { "user": {
"uid": 0, "uid": 996,
"gid": 0 "gid": 994
}, },
"args": [ "args": [
"/usr/bin/kube-proxy-docker.sh" "/usr/bin/kube-proxy-docker.sh"
@ -320,16 +320,6 @@
"rbind", "rbind",
"rprivate" "rprivate"
] ]
},
{
"type": "bind",
"source": "/run",
"destination": "/run",
"options": [
"rbind",
"rw",
"mode=755"
]
} }
], ],
"linux": { "linux": {

View file

@ -3,6 +3,6 @@
source /etc/kubernetes/proxy source /etc/kubernetes/proxy
source /etc/kubernetes/config source /etc/kubernetes/config
ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_PROXY_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs) ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_PROXY_ARGS"
exec /usr/bin/kube-proxy $ARGS exec /usr/bin/kube-proxy $ARGS