mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-03 23:40:03 +00:00 
			
		
		
		
	Fix comparison of golang versions
Change hack/lib/golang.sh to compare golang version properly with "sort -s -t. -k 1,1 -k 2,2n -k 3,3n", which sorts key by key and not as strings.
This commit is contained in:
		
				
					committed by
					
						
						Spyros Trigazis
					
				
			
			
				
	
			
			
			
						parent
						
							f6d0632bbb
						
					
				
				
					commit
					fc37221db5
				
			@@ -323,7 +323,7 @@ EOF
 | 
				
			|||||||
  go_version=($(go version))
 | 
					  go_version=($(go version))
 | 
				
			||||||
  local minimum_go_version
 | 
					  local minimum_go_version
 | 
				
			||||||
  minimum_go_version=go1.9.1
 | 
					  minimum_go_version=go1.9.1
 | 
				
			||||||
  if [[ "${go_version[2]}" < "${minimum_go_version}" && "${go_version[2]}" != "devel" ]]; then
 | 
					  if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
 | 
				
			||||||
    kube::log::usage_from_stdin <<EOF
 | 
					    kube::log::usage_from_stdin <<EOF
 | 
				
			||||||
Detected go version: ${go_version[*]}.
 | 
					Detected go version: ${go_version[*]}.
 | 
				
			||||||
Kubernetes requires ${minimum_go_version} or greater.
 | 
					Kubernetes requires ${minimum_go_version} or greater.
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user