Fix entrypoint for k8s components in podman
Upstream k8s images changed the entrypoint to /hyperkube instead of shell. Set the entrypoint to /hyperkube which works for v1.17.x and v1.16.x. podman inspect k8s.gcr.io/hyperkube:v1.16.0 | grep Entrypoint -A 2 podman inspect k8s.gcr.io/hyperkube:v1.17.0 | grep Entrypoint -A 2 "Entrypoint": [ "/hyperkube" ] story: 2007031 task: 37834 Change-Id: I021aeeef9f39dd426c1f335161a3d4b3f51670e8 Signed-off-by: Spyros Trigazis <strigazi@gmail.com>
This commit is contained in:
parent
c8cc8f0aef
commit
8fa77dae0b
|
@ -87,16 +87,17 @@ EnvironmentFile=/etc/kubernetes/config
|
||||||
EnvironmentFile=/etc/kubernetes/apiserver
|
EnvironmentFile=/etc/kubernetes/apiserver
|
||||||
ExecStartPre=/bin/mkdir -p /etc/kubernetes/
|
ExecStartPre=/bin/mkdir -p /etc/kubernetes/
|
||||||
ExecStartPre=-/usr/bin/podman rm kube-apiserver
|
ExecStartPre=-/usr/bin/podman rm kube-apiserver
|
||||||
ExecStartPre=-/bin/bash -c '/usr/bin/podman run --privileged --user root --net host --rm --volume /usr/local/bin:/host/usr/local/bin \${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} /bin/sh -c "cp /usr/local/bin/kubectl /host/usr/local/bin/kubectl"'
|
ExecStartPre=-/bin/bash -c '/usr/bin/podman run --privileged --user root --net host --entrypoint /bin/bash --rm --volume /usr/local/bin:/host/usr/local/bin \${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} -c "cp /usr/local/bin/kubectl /host/usr/local/bin/kubectl"'
|
||||||
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-apiserver \\
|
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-apiserver \\
|
||||||
--net host \\
|
--net host \\
|
||||||
|
--entrypoint /hyperkube \\
|
||||||
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
||||||
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
||||||
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
||||||
--volume /run:/run \\
|
--volume /run:/run \\
|
||||||
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
||||||
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
||||||
/hyperkube kube-apiserver \\
|
kube-apiserver \\
|
||||||
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_ETCD_SERVERS \$KUBE_API_ADDRESS \$KUBE_API_PORT \$KUBELET_PORT \$KUBE_SERVICE_ADDRESSES \$KUBE_ADMISSION_CONTROL \$KUBE_API_ARGS'
|
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_ETCD_SERVERS \$KUBE_API_ADDRESS \$KUBE_API_PORT \$KUBELET_PORT \$KUBE_SERVICE_ADDRESSES \$KUBE_ADMISSION_CONTROL \$KUBE_API_ARGS'
|
||||||
ExecStop=-/usr/bin/podman stop kube-apiserver
|
ExecStop=-/usr/bin/podman stop kube-apiserver
|
||||||
Delegate=yes
|
Delegate=yes
|
||||||
|
@ -118,13 +119,14 @@ ExecStartPre=/bin/mkdir -p /etc/kubernetes/
|
||||||
ExecStartPre=-/usr/bin/podman rm kube-controller-manager
|
ExecStartPre=-/usr/bin/podman rm kube-controller-manager
|
||||||
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-controller-manager \\
|
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-controller-manager \\
|
||||||
--net host \\
|
--net host \\
|
||||||
|
--entrypoint /hyperkube \\
|
||||||
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
||||||
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
||||||
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
||||||
--volume /run:/run \\
|
--volume /run:/run \\
|
||||||
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
||||||
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
||||||
/hyperkube kube-controller-manager \\
|
kube-controller-manager \\
|
||||||
--secure-port=0 \\
|
--secure-port=0 \\
|
||||||
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_CONTROLLER_MANAGER_ARGS'
|
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_CONTROLLER_MANAGER_ARGS'
|
||||||
ExecStop=-/usr/bin/podman stop kube-controller-manager
|
ExecStop=-/usr/bin/podman stop kube-controller-manager
|
||||||
|
@ -147,13 +149,14 @@ ExecStartPre=/bin/mkdir -p /etc/kubernetes/
|
||||||
ExecStartPre=-/usr/bin/podman rm kube-scheduler
|
ExecStartPre=-/usr/bin/podman rm kube-scheduler
|
||||||
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-scheduler \\
|
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-scheduler \\
|
||||||
--net host \\
|
--net host \\
|
||||||
|
--entrypoint /hyperkube \\
|
||||||
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
||||||
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
||||||
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
||||||
--volume /run:/run \\
|
--volume /run:/run \\
|
||||||
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
||||||
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
||||||
/hyperkube kube-scheduler \\
|
kube-scheduler \\
|
||||||
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_SCHEDULER_ARGS'
|
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_SCHEDULER_ARGS'
|
||||||
ExecStop=-/usr/bin/podman stop kube-scheduler
|
ExecStop=-/usr/bin/podman stop kube-scheduler
|
||||||
Delegate=yes
|
Delegate=yes
|
||||||
|
@ -183,6 +186,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
|
||||||
--privileged \\
|
--privileged \\
|
||||||
--pid host \\
|
--pid host \\
|
||||||
--network host \\
|
--network host \\
|
||||||
|
--entrypoint /hyperkube \\
|
||||||
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
|
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
|
||||||
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
||||||
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
||||||
|
@ -201,7 +205,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
|
||||||
--volume /var/run/lock:/var/run/lock:z \\
|
--volume /var/run/lock:/var/run/lock:z \\
|
||||||
--volume /opt/cni/bin:/opt/cni/bin:z \\
|
--volume /opt/cni/bin:/opt/cni/bin:z \\
|
||||||
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
||||||
/hyperkube kubelet \\
|
kubelet \\
|
||||||
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBELET_API_SERVER \$KUBELET_ADDRESS \$KUBELET_PORT \$KUBELET_HOSTNAME \$KUBELET_ARGS'
|
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBELET_API_SERVER \$KUBELET_ADDRESS \$KUBELET_PORT \$KUBELET_HOSTNAME \$KUBELET_ARGS'
|
||||||
ExecStop=-/usr/bin/podman stop kubelet
|
ExecStop=-/usr/bin/podman stop kubelet
|
||||||
Delegate=yes
|
Delegate=yes
|
||||||
|
@ -224,6 +228,7 @@ ExecStartPre=-/usr/bin/podman rm kube-proxy
|
||||||
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
|
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
|
||||||
--privileged \\
|
--privileged \\
|
||||||
--net host \\
|
--net host \\
|
||||||
|
--entrypoint /hyperkube \\
|
||||||
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
||||||
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
||||||
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
||||||
|
@ -233,7 +238,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
|
||||||
--volume /lib/modules:/lib/modules:ro \\
|
--volume /lib/modules:/lib/modules:ro \\
|
||||||
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
||||||
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
||||||
/hyperkube kube-proxy \\
|
kube-proxy \\
|
||||||
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_PROXY_ARGS'
|
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_PROXY_ARGS'
|
||||||
ExecStop=-/usr/bin/podman stop kube-proxy
|
ExecStop=-/usr/bin/podman stop kube-proxy
|
||||||
Delegate=yes
|
Delegate=yes
|
||||||
|
|
|
@ -74,12 +74,13 @@ ExecStartPre=/bin/mkdir -p /etc/kubernetes/manifests
|
||||||
ExecStartPre=/bin/mkdir -p /var/lib/calico
|
ExecStartPre=/bin/mkdir -p /var/lib/calico
|
||||||
ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
|
ExecStartPre=/bin/mkdir -p /var/lib/kubelet/volumeplugins
|
||||||
ExecStartPre=/bin/mkdir -p /opt/cni/bin
|
ExecStartPre=/bin/mkdir -p /opt/cni/bin
|
||||||
ExecStartPre=-/bin/bash -c '/usr/bin/podman run --privileged --user root --net host --rm --volume /usr/local/bin:/host/usr/local/bin \${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} /bin/sh -c "cp /usr/local/bin/kubectl /host/usr/local/bin/kubectl"'
|
ExecStartPre=-/bin/bash -c '/usr/bin/podman run --privileged --user root --net host --entrypoint /bin/bash --rm --volume /usr/local/bin:/host/usr/local/bin \${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} -c "cp /usr/local/bin/kubectl /host/usr/local/bin/kubectl"'
|
||||||
ExecStartPre=-/usr/bin/podman rm kubelet
|
ExecStartPre=-/usr/bin/podman rm kubelet
|
||||||
ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
|
ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
|
||||||
--privileged \\
|
--privileged \\
|
||||||
--pid host \\
|
--pid host \\
|
||||||
--network host \\
|
--network host \\
|
||||||
|
--entrypoint /hyperkube \\
|
||||||
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
|
--volume /etc/cni/net.d:/etc/cni/net.d:ro,z \\
|
||||||
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
||||||
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
||||||
|
@ -98,7 +99,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kubelet \\
|
||||||
--volume /var/run/lock:/var/run/lock:z \\
|
--volume /var/run/lock:/var/run/lock:z \\
|
||||||
--volume /opt/cni/bin:/opt/cni/bin:z \\
|
--volume /opt/cni/bin:/opt/cni/bin:z \\
|
||||||
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
||||||
/hyperkube kubelet \\
|
kubelet \\
|
||||||
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBELET_API_SERVER \$KUBELET_ADDRESS \$KUBELET_PORT \$KUBELET_HOSTNAME \$KUBELET_ARGS'
|
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBELET_API_SERVER \$KUBELET_ADDRESS \$KUBELET_PORT \$KUBELET_HOSTNAME \$KUBELET_ARGS'
|
||||||
ExecStop=-/usr/bin/podman stop kubelet
|
ExecStop=-/usr/bin/podman stop kubelet
|
||||||
Delegate=yes
|
Delegate=yes
|
||||||
|
@ -121,6 +122,7 @@ ExecStartPre=-/usr/bin/podman rm kube-proxy
|
||||||
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
|
ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
|
||||||
--privileged \\
|
--privileged \\
|
||||||
--net host \\
|
--net host \\
|
||||||
|
--entrypoint /hyperkube \\
|
||||||
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
--volume /etc/kubernetes:/etc/kubernetes:ro,z \\
|
||||||
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
--volume /usr/lib/os-release:/etc/os-release:ro \\
|
||||||
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
--volume /etc/ssl/certs:/etc/ssl/certs:ro \\
|
||||||
|
@ -130,7 +132,7 @@ ExecStart=/bin/bash -c '/usr/bin/podman run --name kube-proxy \\
|
||||||
--volume /lib/modules:/lib/modules:ro \\
|
--volume /lib/modules:/lib/modules:ro \\
|
||||||
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
--volume /etc/pki/tls/certs:/usr/share/ca-certificates:ro \\
|
||||||
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
\${CONTAINER_INFRA_PREFIX:-k8s.gcr.io/}hyperkube:\${KUBE_TAG} \\
|
||||||
/hyperkube kube-proxy \\
|
kube-proxy \\
|
||||||
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_PROXY_ARGS'
|
\$KUBE_LOGTOSTDERR \$KUBE_LOG_LEVEL \$KUBE_MASTER \$KUBE_PROXY_ARGS'
|
||||||
ExecStop=-/usr/bin/podman stop kube-proxy
|
ExecStop=-/usr/bin/podman stop kube-proxy
|
||||||
Delegate=yes
|
Delegate=yes
|
||||||
|
|
Loading…
Reference in New Issue