mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	enhance lsb_release detection for multi-docker
This commit is contained in:
		@@ -75,6 +75,15 @@ detect_lsb() {
 | 
				
			|||||||
    fi
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
 | 
					    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    case "${lsb_dist}" in
 | 
				
			||||||
 | 
					        amzn|centos|debian|ubuntu)
 | 
				
			||||||
 | 
					            ;;
 | 
				
			||||||
 | 
					        *)
 | 
				
			||||||
 | 
					            echo "Error: We currently only support ubuntu|debian|amzn|centos."
 | 
				
			||||||
 | 
					            exit 1
 | 
				
			||||||
 | 
					            ;;
 | 
				
			||||||
 | 
					    esac
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -106,7 +115,7 @@ start_k8s(){
 | 
				
			|||||||
    source subnet.env
 | 
					    source subnet.env
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Configure docker net settings, then restart it
 | 
					    # Configure docker net settings, then restart it
 | 
				
			||||||
    case "$lsb_dist" in
 | 
					    case "${lsb_dist}" in
 | 
				
			||||||
        amzn)
 | 
					        amzn)
 | 
				
			||||||
            DOCKER_CONF="/etc/sysconfig/docker"
 | 
					            DOCKER_CONF="/etc/sysconfig/docker"
 | 
				
			||||||
            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
 | 
					            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
 | 
				
			||||||
@@ -129,7 +138,7 @@ start_k8s(){
 | 
				
			|||||||
            apt-get install bridge-utils && brctl delbr docker0 && service docker restart
 | 
					            apt-get install bridge-utils && brctl delbr docker0 && service docker restart
 | 
				
			||||||
            ;;
 | 
					            ;;
 | 
				
			||||||
        *)
 | 
					        *)
 | 
				
			||||||
            echo "Unsupported operations system $lsb_dist"
 | 
					            echo "Unsupported operations system ${lsb_dist}"
 | 
				
			||||||
            exit 1
 | 
					            exit 1
 | 
				
			||||||
            ;;
 | 
					            ;;
 | 
				
			||||||
    esac
 | 
					    esac
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -84,6 +84,15 @@ detect_lsb() {
 | 
				
			|||||||
    fi
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
 | 
					    lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    case "${lsb_dist}" in
 | 
				
			||||||
 | 
					        amzn|centos|debian|ubuntu)
 | 
				
			||||||
 | 
					            ;;
 | 
				
			||||||
 | 
					        *)
 | 
				
			||||||
 | 
					            echo "Error: We currently only support ubuntu|debian|amzn|centos."
 | 
				
			||||||
 | 
					            exit 1
 | 
				
			||||||
 | 
					            ;;
 | 
				
			||||||
 | 
					    esac
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -108,7 +117,7 @@ start_k8s() {
 | 
				
			|||||||
    source subnet.env
 | 
					    source subnet.env
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Configure docker net settings, then restart it
 | 
					    # Configure docker net settings, then restart it
 | 
				
			||||||
    case "$lsb_dist" in
 | 
					    case "${lsb_dist}" in
 | 
				
			||||||
        centos)
 | 
					        centos)
 | 
				
			||||||
            DOCKER_CONF="/etc/sysconfig/docker"
 | 
					            DOCKER_CONF="/etc/sysconfig/docker"
 | 
				
			||||||
            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
 | 
					            echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
 | 
				
			||||||
@@ -131,7 +140,7 @@ start_k8s() {
 | 
				
			|||||||
            apt-get install bridge-utils && brctl delbr docker0 && service docker restart
 | 
					            apt-get install bridge-utils && brctl delbr docker0 && service docker restart
 | 
				
			||||||
            ;;
 | 
					            ;;
 | 
				
			||||||
        *)
 | 
					        *)
 | 
				
			||||||
            echo "Unsupported operations system $lsb_dist"
 | 
					            echo "Unsupported operations system ${lsb_dist}"
 | 
				
			||||||
            exit 1
 | 
					            exit 1
 | 
				
			||||||
            ;;
 | 
					            ;;
 | 
				
			||||||
    esac
 | 
					    esac
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user