chore: resolve conflicts

Signed-off-by: Nikita Korolev <[email protected]>

Author: universal-itengineer

.github/workflows/e2e.yaml

@@ -1,9 +1,24 @@
+# Copyright 2024 Flant JSC
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 name: e2e
 
 env:
   CI_COMMIT_REF_NAME: ${{ github.ref_name }}
 
 on:
+  workflow_dispatch:
   pull_request:
     branches:
       - ci/tests/e2e-workflow
@@ -22,13 +37,19 @@ concurrency:
 jobs:
   show_dev_manifest:
     runs-on: ubuntu-latest
-    name: Show manifest
+    name: Run e2e
     steps:
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+
       - name: Install Task
         uses: arduino/setup-task@v2
-      
-      - uses: azure/setup-kubectl@v3
-         # default is latest stable
+
+      - uses:
+          azure/setup-kubectl@v3
+          # default is latest stable
         id: install
 
       - uses: actions/checkout@v4
@@ -38,13 +59,8 @@ jobs:
           method: service-account
           k8s-url: https://api.e2e.virtlab.flant.com
           k8s-secret: ${{ secrets.E2E_VIRTUALIZATION_SA_SECRET }}
-          # token: ${{ secrets.E2E_VIRTUALIZATION_SA_TOKEN }}
-      
-      - name: Create Namespace
-        run: |
-          kubectl create namespace testgh
-      
-      - name: Get ns and delete
+
+      - name: e2e
         run: |
-          kubectl get ns | grep testgh
-          kubectl delete namespace testgh
+          export E2E_CLUSTERTRANSPORT_KUBECONFIG=$KUBECONFIG
+          task run_local