mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #55624 from mikedanese/bootstrapper
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. GKE misc fixes gce: readd node-bootstrap to kubelet user We still need to be able to create and read CSRs from the kubelet user. revert #55512 Fixes https://github.com/kubernetes/kubernetes/issues/55189 ```release-note NONE ```
This commit is contained in:
commit
3e757c768f
@ -10,5 +10,8 @@ metadata:
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: ClusterRole
|
||||
name: system:node
|
||||
name: system:node-bootstrapper
|
||||
subjects:
|
||||
- apiGroup: rbac.authorization.k8s.io
|
||||
kind: User
|
||||
name: kubelet
|
||||
|
@ -273,11 +273,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then
|
||||
PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE"
|
||||
fi
|
||||
|
||||
# Override default docker storage driver.
|
||||
if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
|
||||
PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER"
|
||||
fi
|
||||
|
||||
# Override default GLBC image
|
||||
if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
|
||||
PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE"
|
||||
|
@ -310,11 +310,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then
|
||||
PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE"
|
||||
fi
|
||||
|
||||
# Override default docker storage driver.
|
||||
if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
|
||||
PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER"
|
||||
fi
|
||||
|
||||
# Override default GLBC image
|
||||
if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
|
||||
PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE"
|
||||
|
@ -852,12 +852,6 @@ function assemble-docker-flags {
|
||||
docker_opts+=" --live-restore=false"
|
||||
fi
|
||||
|
||||
# Override docker storage driver if the environment variable is set
|
||||
|
||||
if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
|
||||
docker_opts+=" --storage-driver=${DOCKER_STORAGE_DRIVER}"
|
||||
fi
|
||||
|
||||
echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker
|
||||
|
||||
if [[ "${use_net_plugin}" == "true" ]]; then
|
||||
|
Loading…
Reference in New Issue
Block a user