mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	Extend PR#5470 for AWS and Vagrant
This commit is contained in:
		| @@ -52,3 +52,14 @@ known_tokens_file="/srv/salt-overlay/salt/kube-apiserver/known_tokens.csv" | |||||||
| mkdir -p /srv/salt-overlay/salt/kubelet | mkdir -p /srv/salt-overlay/salt/kubelet | ||||||
| kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth" | kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth" | ||||||
| (umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file) | (umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file) | ||||||
|  |  | ||||||
|  | # Generate tokens for other "service accounts".  Append to known_tokens. | ||||||
|  | # | ||||||
|  | # NB: If this list ever changes, this script actually has to | ||||||
|  | # change to detect the existence of this file, kill any deleted | ||||||
|  | # old tokens and add any new tokens (to handle the upgrade case). | ||||||
|  | local -r service_accounts=("system:scheduler" "system:controller_manager" "system:logging" "system:monitoring" "system:dns") | ||||||
|  | for account in "${service_accounts[@]}"; do | ||||||
|  |   token=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null) | ||||||
|  |   echo "${token},${account},${account}" >> "${KNOWN_TOKENS_FILE}" | ||||||
|  | done | ||||||
|   | |||||||
| @@ -145,6 +145,17 @@ if [[ ! -f "${known_tokens_file}" ]]; then | |||||||
|   mkdir -p /srv/salt-overlay/salt/kubelet |   mkdir -p /srv/salt-overlay/salt/kubelet | ||||||
|   kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth" |   kubelet_auth_file="/srv/salt-overlay/salt/kubelet/kubernetes_auth" | ||||||
|   (umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file) |   (umask u=rw,go= ; echo "{\"BearerToken\": \"$kubelet_token\", \"Insecure\": true }" > $kubelet_auth_file) | ||||||
|  |  | ||||||
|  |   # Generate tokens for other "service accounts".  Append to known_tokens. | ||||||
|  |   # | ||||||
|  |   # NB: If this list ever changes, this script actually has to | ||||||
|  |   # change to detect the existence of this file, kill any deleted | ||||||
|  |   # old tokens and add any new tokens (to handle the upgrade case). | ||||||
|  |   local -r service_accounts=("system:scheduler" "system:controller_manager" "system:logging" "system:monitoring" "system:dns") | ||||||
|  |   for account in "${service_accounts[@]}"; do | ||||||
|  |     token=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null) | ||||||
|  |     echo "${token},${account},${account}" >> "${KNOWN_TOKENS_FILE}" | ||||||
|  |   done | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # Configure nginx authorization | # Configure nginx authorization | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user