mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Merge pull request #101751 from vinayakankugoyal/sshproxy
Recursive chown the /etc/srv/sshproxy if kube-apiserver is running as…
This commit is contained in:
		@@ -278,7 +278,7 @@ function start-kube-apiserver {
 | 
				
			|||||||
    params+=" --advertise-address=${MASTER_ADVERTISE_ADDRESS}"
 | 
					    params+=" --advertise-address=${MASTER_ADVERTISE_ADDRESS}"
 | 
				
			||||||
    if [[ -n "${PROXY_SSH_USER:-}" ]]; then
 | 
					    if [[ -n "${PROXY_SSH_USER:-}" ]]; then
 | 
				
			||||||
      if [[ -n "${KUBE_API_SERVER_RUNASUSER:-}" && -n "${KUBE_API_SERVER_RUNASGROUP:-}" ]]; then
 | 
					      if [[ -n "${KUBE_API_SERVER_RUNASUSER:-}" && -n "${KUBE_API_SERVER_RUNASGROUP:-}" ]]; then
 | 
				
			||||||
        chown "${KUBE_API_SERVER_RUNASUSER}":"${KUBE_API_SERVER_RUNASGROUP}" /etc/srv/sshproxy
 | 
					        chown -R "${KUBE_API_SERVER_RUNASUSER}":"${KUBE_API_SERVER_RUNASGROUP}" /etc/srv/sshproxy/
 | 
				
			||||||
      fi
 | 
					      fi
 | 
				
			||||||
      params+=" --ssh-user=${PROXY_SSH_USER}"
 | 
					      params+=" --ssh-user=${PROXY_SSH_USER}"
 | 
				
			||||||
      params+=" --ssh-keyfile=/etc/srv/sshproxy/.sshkeyfile"
 | 
					      params+=" --ssh-keyfile=/etc/srv/sshproxy/.sshkeyfile"
 | 
				
			||||||
@@ -287,7 +287,7 @@ function start-kube-apiserver {
 | 
				
			|||||||
    local -r vm_external_ip=$(get-metadata-value "instance/network-interfaces/0/access-configs/0/external-ip")
 | 
					    local -r vm_external_ip=$(get-metadata-value "instance/network-interfaces/0/access-configs/0/external-ip")
 | 
				
			||||||
    if [[ -n "${PROXY_SSH_USER:-}" ]]; then
 | 
					    if [[ -n "${PROXY_SSH_USER:-}" ]]; then
 | 
				
			||||||
      if [[ -n "${KUBE_API_SERVER_RUNASUSER:-}" && -n "${KUBE_API_SERVER_RUNASGROUP:-}" ]]; then
 | 
					      if [[ -n "${KUBE_API_SERVER_RUNASUSER:-}" && -n "${KUBE_API_SERVER_RUNASGROUP:-}" ]]; then
 | 
				
			||||||
        chown "${KUBE_API_SERVER_RUNASUSER}":"${KUBE_API_SERVER_RUNASGROUP}" /etc/srv/sshproxy
 | 
					        chown -R "${KUBE_API_SERVER_RUNASUSER}":"${KUBE_API_SERVER_RUNASGROUP}" /etc/srv/sshproxy/
 | 
				
			||||||
      fi
 | 
					      fi
 | 
				
			||||||
      params+=" --advertise-address=${vm_external_ip}"
 | 
					      params+=" --advertise-address=${vm_external_ip}"
 | 
				
			||||||
      params+=" --ssh-user=${PROXY_SSH_USER}"
 | 
					      params+=" --ssh-user=${PROXY_SSH_USER}"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user