ci: add ipv6 install e2e

kubeovn · Jul 21, 2020 · 82140c9 · 82140c9
1 parent 6f187c4
commit 82140c9
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 6 deletions.
diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml
@@ -32,6 +32,14 @@ jobs:
       - name: Docker Buildx
         uses: crazy-max/ghaction-docker-buildx@v3
 
+      - name: Go Build Cache
+        uses: actions/cache@v2
+        with:
+          path: /home/runner/.cache/go-build
+          key: ${{ runner.os }}-go-x86-build-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-x86-build-
+
       - name: Go Mod Cache
         uses: actions/cache@v2
         with:
@@ -67,7 +75,7 @@ jobs:
           name: image
           path: image.tar
 
-  singlee2e:
+  single-e2e:
     needs: build
     name: 1-master-e2e
     runs-on: ubuntu-latest
@@ -105,7 +113,7 @@ jobs:
           sudo chmod 666 /home/runner/.kube/config
           make e2e
 
-  hae2e:
+  ha-e2e:
     needs: build
     name: 3-master-e2e
     runs-on: ubuntu-latest
@@ -143,8 +151,37 @@ jobs:
           sudo chmod 666 /home/runner/.kube/config
           make e2e
 
+
+  ipv6-e2e:
+    needs: build
+    name: ipv6-e2e
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Init Kind
+        run: |
+          pip install j2cli --user
+          pip install "j2cli[yaml]" --user
+          sudo PATH=~/.local/bin:$PATH make kind-init-ipv6
+
+      - name: Download image
+        uses: actions/download-artifact@v2
+        with:
+          name: image
+
+      - name: Load Image
+        run: |
+          docker load --input image.tar
+
+      - name: Install Kube-OVN
+        run: |
+          docker load --input image.tar
+          sudo make kind-install-ipv6
+
   push:
-    needs: [singlee2e, hae2e]
+    needs: [single-e2e, ha-e2e, ipv6-e2e]
     name: push
     runs-on: ubuntu-latest
     steps:

diff --git a/Makefile b/Makefile
@@ -65,16 +65,30 @@ kind-init:
 	kind delete cluster --name=kube-ovn
 	ip_family=ipv4 ha=false j2 yamls/kind.yaml.j2 -o yamls/kind.yaml
 	kind create cluster --config yamls/kind.yaml --name kube-ovn
+	kubectl get no -o wide
 
 kind-install:
 	kind load docker-image --name kube-ovn ${REGISTRY}/kube-ovn:${RELEASE_TAG}
 	kubectl taint node kube-ovn-control-plane node-role.kubernetes.io/master:NoSchedule-
-	bash dist/images/install.sh
+	dist/images/install.sh
+	kubectl get no -o wide
 
 kind-init-ha:
 	kind delete cluster --name=kube-ovn
 	ip_family=ipv4 ha=true j2 yamls/kind.yaml.j2 -o yamls/kind.yaml
 	kind create cluster --config yamls/kind.yaml --name kube-ovn
+	kubectl get no -o wide
+
+kind-init-ipv6:
+	kind delete cluster --name=kube-ovn
+	ip_family=ipv6 ha=false j2 yamls/kind.yaml.j2 -o yamls/kind.yaml
+	kind create cluster --config yamls/kind.yaml --name kube-ovn
+	kubectl get no -o wide
+
+kind-install-ipv6:
+	kind load docker-image --name kube-ovn ${REGISTRY}/kube-ovn:${RELEASE_TAG}
+	kubectl taint node kube-ovn-control-plane node-role.kubernetes.io/master:NoSchedule-
+	IPv6=true dist/images/install.sh
 
 kind-reload:
 	kind load docker-image --name kube-ovn ${REGISTRY}/kube-ovn:${RELEASE_TAG}

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1,12 +1,24 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+IPv6=${IPv6:-false}
+
 REGISTRY="kubeovn"
 NAMESPACE="kube-system"                # The ns to deploy kube-ovn
 POD_CIDR="10.16.0.0/16"                # Do NOT overlap with NODE/SVC/JOIN CIDR
-EXCLUDE_IPS=""                         # EXCLUDE_IPS for default subnet
 SVC_CIDR="10.96.0.0/12"                # Do NOT overlap with NODE/POD/JOIN CIDR
 JOIN_CIDR="100.64.0.0/16"              # Do NOT overlap with NODE/POD/SVC CIDR
+PINGER_EXTERNAL_ADDRESS="114.114.114.114"  # Pinger check external ip probe
+PINGER_EXTERNAL_DOMAIN="alauda.cn"         # Pinger check external domain probe
+if [ "$IPv6" = "true" ]; then
+  POD_CIDR="fd00:10:16::/64"                # Do NOT overlap with NODE/SVC/JOIN CIDR
+  SVC_CIDR="fd00:10:96::/112"                # Do NOT overlap with NODE/POD/JOIN CIDR
+  JOIN_CIDR="fd00:100:64::/64"              # Do NOT overlap with NODE/POD/SVC CIDR
+  PINGER_EXTERNAL_ADDRESS="2400:3200::1"
+  PINGER_EXTERNAL_DOMAIN="google.com"
+fi
+
+EXCLUDE_IPS=""                         # EXCLUDE_IPS for default subnet
 LABEL="node-role.kubernetes.io/master" # The node label to deploy OVN DB
 IFACE=""                               # The nic to support container network, if empty will use the nic that the default route use
 NETWORK_TYPE="geneve"                  # geneve or vlan
@@ -1256,7 +1268,7 @@ spec:
       containers:
         - name: pinger
           image: "$REGISTRY/kube-ovn:$VERSION"
-          command: ["/kube-ovn/kube-ovn-pinger", "--external-address=114.114.114.114", "--external-dns=alauda.cn"]
+          command: ["/kube-ovn/kube-ovn-pinger", "--external-address=$PINGER_EXTERNAL_ADDRESS", "--external-dns=$PINGER_EXTERNAL_DOMAIN"]
           imagePullPolicy: $IMAGE_PULL_POLICY
           securityContext:
             runAsUser: 0

diff --git a/pkg/pinger/config.go b/pkg/pinger/config.go
@@ -81,6 +81,7 @@ func ParseFlags() (*Configuration, error) {
 	if err := config.initKubeClient(); err != nil {
 		return nil, err
 	}
+	klog.Infof("pinger config is %+v", config)
 	return config, nil
 }