Skip to content

K
k3s
Unverified Commit 3e757c76 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents 02b3928a dc616dc2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 17 deletions
cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml
View file @ 3e757c76
...@@ -10,5 +10,8 @@ metadata: ...@@ -10,5 +10,8 @@ metadata:
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: system:node name: system:node-bootstrapper
subjects: subjects:
- apiGroup: rbac.authorization.k8s.io
kind: User
name: kubelet
cluster/gce/config-default.sh
View file @ 3e757c76
...@@ -273,11 +273,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then ...@@ -273,11 +273,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then
PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE" PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE"
fi fi
# Override default docker storage driver.
if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER"
fi
# Override default GLBC image # Override default GLBC image
if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE" PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE"
......
cluster/gce/config-test.sh
View file @ 3e757c76
...@@ -310,11 +310,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then ...@@ -310,11 +310,6 @@ if [[ -n "${DISABLE_DOCKER_LIVE_RESTORE:-}" ]]; then
PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE" PROVIDER_VARS="${PROVIDER_VARS:-} DISABLE_DOCKER_LIVE_RESTORE"
fi fi
# Override default docker storage driver.
if [[ -n "${DOCKER_STORAGE_DRIVER:-}" ]]; then
PROVIDER_VARS="${PROVIDER_VARS:-} DOCKER_STORAGE_DRIVER"
fi
# Override default GLBC image # Override default GLBC image
if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then
PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE" PROVIDER_VARS="${PROVIDER_VARS:-} GCE_GLBC_IMAGE"
......
cluster/gce/gci/configure-helper.sh
View file @ 3e757c76
...@@ -852,12 +852,6 @@ function assemble-docker-flags { ...@@ -852,12 +852,6 @@ function assemble-docker-flags {
docker_opts+=" --live-restore=false" docker_opts+=" --live-restore=false"
fi 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 echo "DOCKER_OPTS=\"${docker_opts} ${EXTRA_DOCKER_OPTS:-}\"" > /etc/default/docker
if [[ "${use_net_plugin}" == "true" ]]; then if [[ "${use_net_plugin}" == "true" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment