mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #105134 from aojea/hack-local-resolv
local-cluster-up: allow to specify the kubelet resolv.conf
This commit is contained in:
commit
a3d62e6925
@ -222,6 +222,7 @@ API_BIND_ADDR=${API_BIND_ADDR:-"0.0.0.0"}
|
|||||||
EXTERNAL_HOSTNAME=${EXTERNAL_HOSTNAME:-localhost}
|
EXTERNAL_HOSTNAME=${EXTERNAL_HOSTNAME:-localhost}
|
||||||
|
|
||||||
KUBELET_HOST=${KUBELET_HOST:-"127.0.0.1"}
|
KUBELET_HOST=${KUBELET_HOST:-"127.0.0.1"}
|
||||||
|
KUBELET_RESOLV_CONF=${KUBELET_RESOLV_CONF:-"/etc/resolv.conf"}
|
||||||
# By default only allow CORS for requests on localhost
|
# By default only allow CORS for requests on localhost
|
||||||
API_CORS_ALLOWED_ORIGINS=${API_CORS_ALLOWED_ORIGINS:-/127.0.0.1(:[0-9]+)?$,/localhost(:[0-9]+)?$}
|
API_CORS_ALLOWED_ORIGINS=${API_CORS_ALLOWED_ORIGINS:-/127.0.0.1(:[0-9]+)?$,/localhost(:[0-9]+)?$}
|
||||||
KUBELET_PORT=${KUBELET_PORT:-10250}
|
KUBELET_PORT=${KUBELET_PORT:-10250}
|
||||||
@ -815,6 +816,7 @@ readOnlyPort: ${KUBELET_READ_ONLY_PORT}
|
|||||||
rotateCertificates: true
|
rotateCertificates: true
|
||||||
runtimeRequestTimeout: "${RUNTIME_REQUEST_TIMEOUT}"
|
runtimeRequestTimeout: "${RUNTIME_REQUEST_TIMEOUT}"
|
||||||
staticPodPath: "${POD_MANIFEST_PATH}"
|
staticPodPath: "${POD_MANIFEST_PATH}"
|
||||||
|
resolvConf: "${KUBELET_RESOLV_CONF}"
|
||||||
EOF
|
EOF
|
||||||
{
|
{
|
||||||
# authentication
|
# authentication
|
||||||
|
Loading…
Reference in New Issue
Block a user