add e2e tests and istio lua scripts

Signed-off-by: Kuromesi <[email protected]>
Kuromesi · Sep 25, 2023 · 4c558ad · 4c558ad
1 parent 57f9853
commit 4c558ad
Show file tree

Hide file tree

Showing 18 changed files with 5,517 additions and 0 deletions.
diff --git a/.github/workflows/e2e-custom.yaml b/.github/workflows/e2e-custom.yaml
@@ -0,0 +1,84 @@
+name: E2E-Custom
+
+on:
+  push:
+    branches:
+      - master
+      - release-*
+  pull_request: {}
+  workflow_dispatch: {}
+
+env:
+  # Common versions
+  GO_VERSION: '1.17'
+  KIND_IMAGE: 'kindest/node:v1.23.3'
+  KIND_CLUSTER_NAME: 'ci-testing'
+
+jobs:
+
+  rollout:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - name: Setup Kind Cluster
+        uses: helm/[email protected]
+        with:
+          node_image: ${{ env.KIND_IMAGE }}
+          cluster_name: ${{ env.KIND_CLUSTER_NAME }}
+          config: ./test/kind-conf.yaml
+      - name: Build image
+        run: |
+          export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}"
+          docker build --pull --no-cache . -t $IMAGE
+          kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
+      - name: Install Kruise Rollout
+        run: |
+          set -ex
+          kubectl cluster-info
+          IMG=openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
+          for ((i=1;i<10;i++));
+          do
+            set +e
+            PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l)
+            set -e
+            if [ "$PODS" -eq "1" ]; then
+              break
+            fi
+            sleep 3
+          done
+          set +e
+          PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l)
+          kubectl get node -o yaml
+          kubectl get all -n kruise-rollout -o yaml
+          set -e
+          if [ "$PODS" -eq "1" ]; then
+            echo "Wait for kruise-rollout ready successfully"
+          else
+            echo "Timeout to wait for kruise-rollout ready"
+            exit 1
+          fi
+      - name: Run E2E Tests
+        run: |
+          export KUBECONFIG=/home/runner/.kube/config
+          kubectl apply -f ./test/e2e/test_data/customNetworkProvider/istio_crd.yaml
+          make ginkgo
+          set +e
+          ./bin/ginkgo -timeout 60m -v --focus='Canary rollout with custon network provider' test/e2e
+          retVal=$?
+          # kubectl get pod -n kruise-rollout --no-headers | grep manager | awk '{print $1}' | xargs kubectl logs -n kruise-rollout
+          restartCount=$(kubectl get pod -n kruise-rollout --no-headers | awk '{print $4}')
+          if [ "${restartCount}" -eq "0" ];then
+              echo "Kruise-rollout has not restarted"
+          else
+              kubectl get pod -n kruise-rollout --no-headers
+              echo "Kruise-rollout has restarted, abort!!!"
+              kubectl get pod -n kruise-rollout --no-headers| awk '{print $1}' | xargs kubectl logs -p -n kruise-rollout
+              exit 1
+          fi
+          exit $retVal
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -248,6 +248,17 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - networking.istio.io
+  resources:
+  - destinationrules
+  - virtualservices
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - networking.k8s.io
   resources:

diff --git a/...figuration/networking.istio.io/DestinationRule/testdata/traffic_routing_with_a_match.yaml b/...figuration/networking.istio.io/DestinationRule/testdata/traffic_routing_with_a_match.yaml
@@ -0,0 +1,49 @@
+trafficRouting: 
+  apiVersion: rollouts.kruise.io/v1alpha1
+  kind: TrafficRouting
+  metadata:
+    name: tr-demo
+  spec:
+    strategy:
+      matches:
+        - headers:
+          - type: Exact
+            name: version
+            value: canary
+    objectRef:
+    - service: svc-demo
+      customNetworkRefs:
+      - apiVersion: networking.istio.io/v1beta1
+        kind: DestinationRule
+        name: ds-demo
+original:
+  apiVersion: networking.istio.io/v1beta1
+  kind: DestinationRule
+  metadata:
+    name: ds-demo
+  spec:
+    host: svc-demo
+    trafficPolicy:
+      loadBalancer:
+        simple: ROUND_ROBIN
+    subsets:
+      - labels:
+          version: base
+        name: version-base
+expected:
+  - apiVersion: networking.istio.io/v1beta1
+    kind: DestinationRule
+    metadata:
+      name: ds-demo
+    spec:
+      host: svc-demo
+      trafficPolicy:
+        loadBalancer:
+          simple: ROUND_ROBIN
+      subsets:
+        - labels:
+            version: base
+          name: version-base
+        - labels:
+            istio.service.tag: gray
+          name: canary
diff --git a/lua_configuration/networking.istio.io/DestinationRule/trafficRouting.lua b/lua_configuration/networking.istio.io/DestinationRule/trafficRouting.lua
@@ -0,0 +1,8 @@
+local spec = obj.data.spec
+local canary = {}
+canary.labels = {}
+canary.name = "canary"
+local podLabelKey = "istio.service.tag"
+canary.labels[podLabelKey] = "gray"
+table.insert(spec.subsets, canary)
+return obj.data
diff --git a/lua_configuration/networking.istio.io/VirtualService/testdata/rollout_with_three_steps.yaml b/lua_configuration/networking.istio.io/VirtualService/testdata/rollout_with_three_steps.yaml
@@ -0,0 +1,122 @@
+rollout: 
+  apiVersion: rollouts.kruise.io/v1alpha1
+  kind: Rollout
+  metadata:
+    name: rollouts-demo
+    annotations:
+      rollouts.kruise.io/rolling-style: canary
+  spec:
+    disabled: false
+    objectRef:
+      workloadRef:
+        apiVersion: apps/v1
+        kind: Deployment
+        name: deploy-demo
+    strategy:
+      canary:
+        steps:
+        - matches:
+          - headers:
+            - type: Exact
+              name: user-agent
+              value: pc
+            - type: RegularExpression
+              name: name
+              value: ".*demo"
+        - matches:
+          - headers:
+            - type: Exact
+              name: user-agent
+              value: pc
+          - headers:
+            - type: RegularExpression
+              name: name
+              value: ".*demo"
+        - weight: 50
+        trafficRoutings:
+        - service: svc-demo
+          customNetworkRefs:
+          - apiVersion: networking.istio.io/v1alpha3
+            kind: VirtualService
+            name: vs-demo
+original:
+  apiVersion: networking.istio.io/v1alpha3
+  kind: VirtualService
+  metadata:
+    name: vs-demo
+  spec:
+    hosts:
+    - "*"
+    gateways:
+    - nginx-gateway
+    http:
+    - route:
+      - destination:
+          host: svc-demo
+expected:
+  - apiVersion: networking.istio.io/v1alpha3
+    kind: VirtualService
+    metadata:
+      name: vs-demo
+    spec:
+      hosts:
+      - "*"
+      gateways:
+      - nginx-gateway
+      http:
+      - match:
+        - headers:
+            user-agent:
+              exact: pc
+            name:
+              regex: .*demo
+        route:
+        - destination:
+            host: svc-demo-canary
+      - route:
+        - destination:
+            host: svc-demo
+  - apiVersion: networking.istio.io/v1alpha3
+    kind: VirtualService
+    metadata:
+      name: vs-demo
+    spec:
+      hosts:
+      - "*"
+      gateways:
+      - nginx-gateway
+      http:
+      - match:
+        - headers:
+            name:
+              regex: .*demo
+        route:
+        - destination:
+            host: svc-demo-canary
+      - match:
+        - headers:
+            user-agent:
+              exact: pc
+        route:
+        - destination:
+            host: svc-demo-canary
+      - route:
+        - destination:
+            host: svc-demo
+  - apiVersion: networking.istio.io/v1alpha3
+    kind: VirtualService
+    metadata:
+      name: vs-demo
+    spec:
+      hosts:
+      - "*"
+      gateways:
+      - nginx-gateway
+      http:
+      - route:
+        - destination:
+            host: svc-demo
+          weight: 50
+        - destination:
+            host: svc-demo-canary
+          weight: 50
diff --git a/...nfiguration/networking.istio.io/VirtualService/testdata/traffic_routing_with_a_match.yaml b/...nfiguration/networking.istio.io/VirtualService/testdata/traffic_routing_with_a_match.yaml
@@ -0,0 +1,61 @@
+trafficRouting:
+  apiVersion: rollouts.kruise.io/v1alpha1
+  kind: TrafficRouting
+  metadata:
+    name: tr-demo
+  spec:
+    strategy:
+      matches:
+      - headers:
+        - type: Exact
+          name: user-agent
+          value: pc
+        - type: RegularExpression
+          name: name
+          value: ".*demo"
+    objectRef:
+    - service: svc-demo
+      customNetworkRefs:
+      - apiVersion: networking.istio.io/v1alpha3
+        kind: VirtualService
+        name: vs-demo
+original:
+  apiVersion: networking.istio.io/v1alpha3
+  kind: VirtualService
+  metadata:
+    name: vs-demo
+  spec:
+    hosts:
+    - "*"
+    gateways:
+    - nginx-gateway
+    http:
+    - route:
+      - destination:
+          host: svc-demo
+          subset: base
+expected:
+  - apiVersion: networking.istio.io/v1alpha3
+    kind: VirtualService
+    metadata:
+      name: vs-demo
+    spec:
+      hosts:
+      - "*"
+      gateways:
+      - nginx-gateway
+      http:
+      - match:
+        - headers:
+            user-agent:
+              exact: pc
+            name:
+              regex: .*demo
+        route:
+        - destination:
+            host: svc-demo
+            subset: canary
+      - route:
+        - destination:
+            host: svc-demo
+            subset: base