chore: show install options when installing (#1293)

kubeovn · Feb 14, 2022 · 273eb84 · 273eb84
1 parent 657c3d6
commit 273eb84
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -110,6 +110,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install
 
@@ -166,6 +167,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install
 
@@ -222,6 +224,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install
 
@@ -278,6 +281,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-underlay
 
@@ -350,6 +354,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-single
 
@@ -406,6 +411,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install
 
@@ -444,6 +450,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-ipv6
 
@@ -500,6 +507,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-ipv6
 
@@ -556,6 +564,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-underlay-ipv6
 
@@ -628,6 +637,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-dual
 
@@ -684,6 +694,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-underlay-dual
 
@@ -756,6 +767,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install-underlay-logical-gateway-dual
 
@@ -830,6 +842,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install
 
@@ -888,6 +901,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo make kind-install
 
@@ -944,6 +958,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo ENABLE_NP=false make kind-install
 
@@ -1000,6 +1015,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo PATH=~/.local/bin:$PATH make kind-install-cluster
             sudo PATH=~/.local/bin:$PATH make kind-install-ic
@@ -1062,6 +1078,7 @@ jobs:
         with:
           timeout_minutes: 10
           max_attempts: 3
+          shell: bash
           command: |
             sudo PATH=~/.local/bin:$PATH make kind-install-cilium
             docker exec kube-ovn-control-plane bash -c "ls -al /etc/cni/net.d/"

diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 GO_VERSION = 1.17
+SHELL=/bin/bash
 
 REGISTRY = kubeovn
 DEV_TAG = dev

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -133,6 +133,20 @@ then
   set -u
 fi
 
+echo "-------------------------------"
+echo "Kube-OVN Version:     $VERSION"
+echo "Default Network Mode: $NETWORK_TYPE"
+if [[ $NETWORK_TYPE = "vlan" ]];then
+  echo "Default Vlan Nic:     $VLAN_INTERFACE_NAME"
+  echo "Default Vlan ID:      $VLAN_ID"
+fi
+echo "Default Subnet CIDR:  $POD_CIDR"
+echo "Join Subnet CIDR:     $JOIN_CIDR"
+echo "Enable SVC LB:        $ENABLE_LB"
+echo "Enable Networkpolicy: $ENABLE_NP"
+echo "Enable Mirror:        $ENABLE_MIRROR"
+echo "-------------------------------"
+
 if [[ $ENABLE_SSL = "true" ]];then
   echo "[Step 0/6] Generate SSL key and cert"
   exist=$(kubectl get secret -n kube-system kube-ovn-tls --ignore-not-found)