diff --git a/.github/workflows/e2e_simple.yml b/.github/workflows/e2e_simple.yml deleted file mode 100644 index aa3961f449..0000000000 --- a/.github/workflows/e2e_simple.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: e2e test simple - -on: - workflow_dispatch: - inputs: - skip-undeploy: - description: "Skip undeploy" - required: false - default: "false" - pull_request: - paths-ignore: - - docs/** - -env: - container_registry: ghcr.io/edgelesssys - azure_resource_group: contrast-ci - DO_NOT_TRACK: 1 - -jobs: - test: - runs-on: ubuntu-22.04 - permissions: - contents: read - packages: write - steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 - - uses: ./.github/actions/setup_nix - with: - githubToken: ${{ secrets.GITHUB_TOKEN }} - cachixToken: ${{ secrets.CACHIX_AUTH_TOKEN }} - - name: Log in to ghcr.io Container registry - uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Login to Azure - uses: azure/login@6b2456866fc08b011acb422a92a4aa20e2c4de32 # v2.1.0 - with: - creds: ${{ secrets.CONTRAST_CI_INFRA_AZURE }} - - uses: nicknovitski/nix-develop@a2060d116a50b36dfab02280af558e73ab52427d # v1.1.0 - - name: Generate namespace suffix - id: ns - run: | - uuid=$(cat /proc/sys/kernel/random/uuid) - uid=${uuid##*-} - echo "namespace_suffix=$uid" >> "$GITHUB_OUTPUT" - - name: Create justfile.env - run: | - cat < justfile.env - container_registry=${{ env.container_registry }} - azure_resource_group=${{ env.azure_resource_group }} - namespace_suffix=-${{ steps.ns.outputs.namespace_suffix }} - EOF - - name: Get credentials for CI cluster - run: | - just get-credentials - - name: Build, deploy, contrast generate, contrast set, contrast verify - run: | - just default simple cli-release - - name: Summary - run: | - cat ./workspace/just.namespace | tee -a "${GITHUB_STEP_SUMMARY}" - cat ./workspace/just.perf | tee -a "${GITHUB_STEP_SUMMARY}" - - name: Undeploy - if: always() && inputs.skip-undeploy != 'true' - run: | - just undeploy diff --git a/e2e/internal/kuberesource/resourcegen/main.go b/e2e/internal/kuberesource/resourcegen/main.go index e4d8713b2d..5940da5fe6 100644 --- a/e2e/internal/kuberesource/resourcegen/main.go +++ b/e2e/internal/kuberesource/resourcegen/main.go @@ -37,8 +37,6 @@ func main() { resources, err = kuberesource.CoordinatorRelease() case "runtime": resources, err = kuberesource.Runtime() - case "simple": - resources, err = kuberesource.Simple() case "openssl": resources, err = kuberesource.OpenSSL() case "emojivoto": diff --git a/e2e/internal/kuberesource/sets.go b/e2e/internal/kuberesource/sets.go index 1c449d1853..7ff6dd61c0 100644 --- a/e2e/internal/kuberesource/sets.go +++ b/e2e/internal/kuberesource/sets.go @@ -42,56 +42,6 @@ func Runtime() ([]any, error) { return resources, nil } -// Simple returns a simple set of resources for testing. -func Simple() ([]any, error) { - ns := "edg-default" - - namespace := Namespace(ns) - coordinator := Coordinator(ns).DeploymentApplyConfiguration - coordinatorService := ServiceForDeployment(coordinator) - coordinatorForwarder := PortForwarder("coordinator", ns). - WithListenPort(1313). - WithForwardTarget("coordinator", 1313). - PodApplyConfiguration - - workload := Deployment("workload", ns). - WithSpec(DeploymentSpec(). - WithReplicas(1). - WithSelector(LabelSelector(). - WithMatchLabels(map[string]string{"app.kubernetes.io/name": "workload"}), - ). - WithTemplate(PodTemplateSpec(). - WithLabels(map[string]string{"app.kubernetes.io/name": "workload"}). - WithSpec(PodSpec(). - WithRuntimeClassName(runtimeHandler). - WithContainers( - Container(). - WithName("workload"). - WithImage("docker.io/library/busybox:1.36.1-musl@sha256:d4707523ce6e12afdbe9a3be5ad69027150a834870ca0933baf7516dd1fe0f56"). - WithCommand("/bin/sh", "-c", "echo Workload started ; while true; do sleep 60; done"). - WithResources(ResourceRequirements(). - WithMemoryLimitAndRequest(50), - ), - ), - ), - ), - ) - workload, err := AddInitializer(workload, Initializer()) - if err != nil { - return nil, err - } - - resources := []any{ - namespace, - coordinator, - coordinatorService, - coordinatorForwarder, - workload, - } - - return resources, nil -} - // OpenSSL returns a set of resources for testing with OpenSSL. func OpenSSL() ([]any, error) { ns := "edg-default" diff --git a/justfile b/justfile index 3d2a975b5c..6edebc9074 100644 --- a/justfile +++ b/justfile @@ -25,7 +25,7 @@ initializer: (push "initializer") node-installer: (push "node-installer") default_cli := "contrast.cli" -default_deploy_target := "simple" +default_deploy_target := "openssl" workspace_dir := "workspace" # Generate policies, apply Kubernetes manifests. @@ -49,7 +49,7 @@ populate target=default_deploy_target: set -euo pipefail mkdir -p ./{{ workspace_dir }} case {{ target }} in - "simple" | "openssl" | "emojivoto") + "openssl" | "emojivoto") nix shell .#contrast --command resourcegen {{ target }} ./{{ workspace_dir }}/deployment/deployment.yml ;; *) @@ -82,7 +82,7 @@ apply target=default_deploy_target: kubectl apply -f ./{{ workspace_dir }}/runtime exit 0 ;; - "simple" | "openssl" | "emojivoto") + "openssl" | "emojivoto") : ;; *) @@ -164,9 +164,6 @@ wait-for-workload target=default_deploy_target: set -euo pipefail ns=$(cat ./{{ workspace_dir }}/just.namespace) case {{ target }} in - "simple") - nix run .#scripts.kubectl-wait-ready -- $ns workload - ;; "openssl") nix run .#scripts.kubectl-wait-ready -- $ns openssl-backend nix run .#scripts.kubectl-wait-ready -- $ns openssl-client