Upgrade Otterize-CLI to support new features in future e2e tests

Author: zohar7ch

.github/actions/e2e-test-setup-action/action.yaml

@@ -97,6 +97,13 @@ runs:
         helm install otterize ./helm-charts/network-mapper -n otterize-system --create-namespace --set debug=true $MAPPER_FLAGS $SNIFFER_FLAGS $TELEMETRY_FLAG ${{inputs.install-extra-flags}}
       shell: bash
 
+    - name: Install CLI
+      run: |-
+        wget --header="X-Otterize-Test: true" https://get.otterize.com/otterize-cli/v2.0.3/otterize_linux_x86_64.tar.gz
+        tar xf otterize_linux_x86_64.tar.gz
+        sudo cp otterize /usr/local/bin
+      shell: bash
+
     - name: Wait for Otterize
       run: |-
         kubectl wait pods -n otterize-system -l app=otterize-network-sniffer --for condition=Ready --timeout=90s

.github/workflows/e2e-test.yaml

@@ -59,12 +59,6 @@ jobs:
           sniffer-image: ${{ inputs.sniffer-image }}
           registry: ${{ inputs.registry }}
 
-      - name: Install CLI
-        run: |-
-          wget --header="X-Otterize-Test: true" https://get.otterize.com/otterize-cli/v0.1.30/otterize_linux_x86_64.tar.gz
-          tar xf otterize_linux_x86_64.tar.gz
-          sudo cp otterize /usr/local/bin
-
       - name: Deploy Tutorial services
         run: |-
           kubectl apply -n otterize-tutorial-mapper -f https://docs.otterize.com/code-examples/network-mapper/all.yaml
@@ -131,12 +125,6 @@ jobs:
           registry: ${{ inputs.registry }}
           install-extra-flags: " --set kafkawatcher.enable=true --set kafkawatcher.kafkaServers={\"kafka-0.kafka\"} "
 
-      - name: Install CLI
-        run: |-
-          wget --header="X-Otterize-Test: true" https://get.otterize.com/otterize-cli/v2.0.3/otterize_linux_x86_64.tar.gz
-          tar xf otterize_linux_x86_64.tar.gz
-          sudo cp otterize /usr/local/bin
-
       - name: Deploy Kafka
         run: |-
           helm repo add otterize https://helm.otterize.com

.github/workflows/tests-expected-results/simple-tutorial-intents.json

@@ -1,40 +1,56 @@
 [
   {
     "kind": "ClientIntents",
-    "apiVersion": "k8s.otterize.com/v1alpha2",
+    "apiVersion": "k8s.otterize.com/v2beta1",
     "metadata": {
       "name": "client",
       "namespace": "otterize-tutorial-mapper",
       "creationTimestamp": null
     },
     "spec": {
-      "service": {
-        "name": "client"
+      "workload": {
+        "name": "client",
+        "kind": "Deployment"
       },
-      "calls": [
+      "targets": [
         {
-          "name": "server"
+          "kubernetes": {
+            "name": "server",
+            "kind": "Deployment"
+          }
         }
       ]
+    },
+    "status": {
+      "upToDate": false,
+      "observedGeneration": 0
     }
   },
   {
     "kind": "ClientIntents",
-    "apiVersion": "k8s.otterize.com/v1alpha2",
+    "apiVersion": "k8s.otterize.com/v2beta1",
     "metadata": {
       "name": "client2",
       "namespace": "otterize-tutorial-mapper",
       "creationTimestamp": null
     },
     "spec": {
-      "service": {
-        "name": "client2"
+      "workload": {
+        "name": "client2",
+        "kind": "Deployment"
       },
-      "calls": [
+      "targets": [
         {
-          "name": "server"
+          "kubernetes": {
+            "name": "server",
+            "kind": "Deployment"
+          }
         }
       ]
+    },
+    "status": {
+      "upToDate": false,
+      "observedGeneration": 0
     }
   }
 ]