Remove k3d runtime

eclipse-velocitas · Mar 19, 2024 · e1f764a · e1f764a
1 parent 1989742
commit e1f764a
Show file tree

Hide file tree

Showing 55 changed files with 9 additions and 3,378 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -24,7 +24,6 @@
 				},
 				"python.testing.pytestArgs": [
 					"--ignore=desired_state_generator/test/integration",
-					"--ignore=runtime_k3d/test/integration",
 					"--ignore=runtime_kanto/test/integration",
 					"--ignore=runtime_local/test/integration",
 					"."

diff --git a/.devcontainer/scripts/post-create.sh b/.devcontainer/scripts/post-create.sh
@@ -18,7 +18,7 @@ echo "### Install python requirements                     ###"
 echo "#######################################################"
 # Update pip before installing requirements
 pip3 install --upgrade pip
-for package in runtime_k3d runtime_kanto runtime_local desired_state_generator; do
+for package in runtime_kanto runtime_local desired_state_generator; do
 
     REQUIREMENTS="$package/src/requirements.txt"
     if [ -f $REQUIREMENTS ]; then

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,8 +54,9 @@ jobs:
 
       - name: Install required packages
         run: |
-          pip install -r runtime_k3d/src/requirements.txt
-          pip install -r runtime_k3d/test/requirements.txt
+          pip install -r desired_state_generator/src/requirements.txt
+          pip install -r desired_state_generator/test/requirements.txt
+          pip install -r runtime_local/src/requirements.txt
           pip install -r runtime_local/test/requirements.txt
 
       - name: unit tests
@@ -64,7 +65,7 @@ jobs:
           pytest --ignore-glob='*integration*' --override-ini junit_family=xunit1 --junit-xml=./results/UnitTest/junit.xml \
           --cov . \
           --cov-report=xml:results/CodeCoverage/cobertura-coverage.xml \
-          --cov-branch ./runtime_k3d/test ./runtime_local/test ./desired_state_generator/test
+          --cov-branch ./runtime_local/test ./desired_state_generator/test
 
       - name: Publish Unit Test Results
         uses: mikepenz/action-junit-report@v3
@@ -109,37 +110,6 @@ jobs:
           name: "Log files local"
           path: runtime_local/test/logs
 
-  run-k3d-integration-tests:
-    name: Run Integration Tests for k3d
-    runs-on: ubuntu-22.04
-    env:
-      DAPR_HOST_IP: 127.0.0.1
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Prepare integration Tests
-        uses: ./.github/actions/prepare-int-tests
-        with:
-          package: runtime_k3d
-
-      - name: Install required packages
-        run: |
-          curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
-          sudo wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s 1.10.0
-
-      - name: Run integration tests for k3d
-        run: |
-          cd runtime_k3d/test
-          pytest -s ./integration/integration_test.py::test_scripts_run_successfully_with_down
-
-      - name: Upload log files as artifacts
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: "Log files K3D"
-          path: runtime_k3d/test/logs
-
   run-kanto-integration-tests:
     name: Run Integration Tests for kanto
     runs-on: ubuntu-22.04

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 .DS_Store
 __pycache__
 
-runtime_k3d/src/runtime/deployment/config/helm/templates/values.yaml
 *.egg-info
 dist
 build

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
         args: [--allow-multiple-documents]
-        exclude: ^runtime_k3d/src/runtime/deployment/config/helm/templates/|^runtime_k3d/src/app_deployment/config/helm/templates/|^config/feedercan/
+        exclude: ^config/feedercan/
       - id: check-added-large-files
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
@@ -40,7 +40,6 @@ repos:
           [
             "--config-file",
             "setup.cfg",
-            runtime_k3d,
             runtime_local,
             runtime_kanto,
             desired_state_generator,

diff --git a/README.md b/README.md
@@ -9,9 +9,10 @@ A Velocitas CLI package containing all available and supported Velocitas runtime
 This package contains the following runtimes:
 
 * [Local](./runtime_local/README.md)
-* [Kubernetes (K3D)](./runtime_k3d/README.md)
 * [Kanto](./runtime_kanto/README.md)
 
+**Note**: Support for Kubernetes (K3D) runtime has recently been removed.
+
 ## Runtime Configuration: `runtime.json`
 
 This JSON file contains an array of services which should be started by all runtimes. Every service entry

diff --git a/manifest.json b/manifest.json
@@ -95,124 +95,6 @@
                 }
             ]
         },
-        {
-            "id": "runtime-k3d",
-            "alias": "k3d",
-            "type": "runtime",
-            "programs": [
-                {
-                    "id": "install-deps",
-                    "executable": "python3",
-                    "args": [
-                        "-m",
-                        "pip",
-                        "install",
-                        "-r",
-                        "./runtime_k3d/src/requirements.txt"
-                    ]
-                },
-                {
-                    "id": "up",
-                    "executable": "python3",
-                    "args": [
-                        "./runtime_k3d/src/runtime/runtime-up.py"
-                    ]
-                },
-                {
-                    "id": "down",
-                    "executable": "python3",
-                    "args": [
-                        "./runtime_k3d/src/runtime/runtime-down.py"
-                    ]
-                },
-                {
-                    "id": "generate-podspec",
-                    "executable": "python3",
-                    "args": [
-                        "./runtime_k3d/src/runtime/deployment/gen_podspec.py"
-                    ]
-                },
-                {
-                    "id": "generate-helm",
-                    "executable": "python3",
-                    "args": [
-                        "./runtime_k3d/src/runtime/deployment/gen_helm.py"
-                    ]
-                }
-            ],
-            "onPostInit": [
-                {
-                    "ref": "install-deps"
-                }
-            ],
-            "variables": [
-                {
-                    "name": "daprRuntimeVersion",
-                    "type": "string",
-                    "description": "Version of the dapr.io runtime to use.",
-                    "default": "1.10.3"
-                },
-                {
-                    "name": "daprCliVersion",
-                    "type": "string",
-                    "description": "Version of the dapr.io CLI to use.",
-                    "default": "1.10.0"
-                },
-                {
-                    "name": "runtimeFilePath",
-                    "type": "string",
-                    "description": "Path to the file describing your custom runtime configuration.",
-                    "default": "runtime.json"
-                },
-                {
-                    "name": "mockFilePath",
-                    "type": "string",
-                    "description": "Path to the mocking configuration for the mock service",
-                    "default": "mock.py"
-                }
-            ]
-        },
-        {
-            "id": "deployment-k3d",
-            "alias": "k3d",
-            "type": "deployment",
-            "programs": [
-                {
-                    "id": "build-vehicleapp",
-                    "executable": "python3",
-                    "args": [
-                        "./runtime_k3d/src/app_deployment/build_vehicleapp.py"
-                    ]
-                },
-                {
-                    "id": "deploy-vehicleapp",
-                    "executable": "python3",
-                    "args": [
-                        "./runtime_k3d/src/app_deployment/deploy_vehicleapp.py"
-                    ]
-                },
-                {
-                    "name": "mockFilePath",
-                    "type": "string",
-                    "description": "Path to the mocking configuration for the mock service",
-                    "default": "mock.py"
-                }
-            ],
-            "variables": [
-                {
-                    "name": "dockerfilePath",
-                    "type": "string",
-                    "description": "Path of Dockerfile to use",
-                    "default": "./app/Dockerfile"
-                },
-                {
-                    "name": "vehicleAppPort",
-                    "type": "number",
-                    "description": "Port of VehicleApp to use",
-                    "default": 50008
-                }
-            ]
-        },
         {
             "id": "runtime-kanto",
             "alias": "kanto",

diff --git a/runtime_k3d/README.md b/runtime_k3d/README.md
diff --git a/runtime_k3d/__init__.py b/runtime_k3d/__init__.py
diff --git a/runtime_k3d/src/__init__.py b/runtime_k3d/src/__init__.py
diff --git a/runtime_k3d/src/app_deployment/__init__.py b/runtime_k3d/src/app_deployment/__init__.py
diff --git a/runtime_k3d/src/app_deployment/build_vehicleapp.py b/runtime_k3d/src/app_deployment/build_vehicleapp.py
diff --git a/runtime_k3d/src/app_deployment/config/helm/.helmignore b/runtime_k3d/src/app_deployment/config/helm/.helmignore
diff --git a/runtime_k3d/src/app_deployment/config/helm/Chart.yaml b/runtime_k3d/src/app_deployment/config/helm/Chart.yaml