From 76ec9e8a84646f24ac728a7bb4e2b1d0265a9d8a Mon Sep 17 00:00:00 2001 From: Michael Skalka Date: Tue, 28 Jan 2025 15:42:21 -0500 Subject: [PATCH] chore: move e2e to k8s-tests, restore docker build command in agent --- .github/workflows/agent-ci.yaml | 19 ++----------------- agent/Makefile | 11 +++++++++++ .../helm-chart-test/assert-no-schedule.yaml | 0 .../helm-chart-test/assert-scheduled.yaml | 0 .../helm/helm-chart-test/chainsaw-test.yaml | 0 .../chainsaw/helm/helm-chart-test/values.yaml | 0 .../assert-override-resources.yaml | 0 .../assert-scaled-resources.yaml | 0 .../helm/helm-scale-test/chainsaw-test.yaml | 0 .../helm/helm-scale-test/values-scale.yaml | 0 .../vaules-override-resources.yaml | 0 .../chainsaw/helm/install-cert-manager.sh | 0 .../chainsaw/helm/install-helm-chart.sh | 0 {e2e => k8s-tests}/chainsaw/helm/readme.md | 0 .../chainsaw/helm/taint-nodes.sh | 0 .../chainsaw/helm/uninstall-cert-manager.sh | 0 .../chainsaw/helm/uninstall-helm-chart.sh | 0 .../chainsaw/helm/untaint-nodes.sh | 0 .../assert-update-no-interrupt.yaml | 0 .../assert-update-while-running.yaml | 0 .../skyhook/config-skyhook/assert-update.yaml | 0 .../skyhook/config-skyhook/assert.yaml | 0 .../skyhook/config-skyhook/chainsaw-test.yaml | 0 .../skyhook/config-skyhook/skyhook.yaml | 0 .../config-skyhook/update-no-interrupt.yaml | 0 .../config-skyhook/update-while-running.yaml | 0 .../skyhook/config-skyhook/update.yaml | 0 .../failure-skyhook/chainsaw-test.yaml | 0 .../skyhook/failure-skyhook/node-assert.yaml | 0 .../skyhook/failure-skyhook/skyhook.yaml | 0 .../skyhook/hello-world/chainsaw-test.yaml | 0 .../skyhook/hello-world/configmap-assert.yaml | 0 .../skyhook/hello-world/configmap.yaml | 0 .../skyhook/interrupt-grouping/assert.yaml | 0 .../interrupt-grouping/chainsaw-test.yaml | 0 .../skyhook/interrupt-grouping/skyhook.yaml | 0 .../chainsaw/skyhook/interrupt/assert.yaml | 0 .../skyhook/interrupt/chainsaw-test.yaml | 0 .../chainsaw/skyhook/interrupt/pod.yaml | 0 .../chainsaw/skyhook/interrupt/skyhook.yaml | 0 .../chainsaw/skyhook/nodes_add_taint.sh | 0 .../chainsaw/skyhook/nodes_remove_taint.sh | 0 .../skyhook/pod-finalizer/chainsaw-test.yaml | 0 .../skyhook/pod-finalizer/node-assert.yaml | 0 .../chainsaw/skyhook/pod-finalizer/pod.yaml | 0 {e2e => k8s-tests}/chainsaw/skyhook/readme.md | 0 .../chainsaw/skyhook/rest_nodes.sh | 0 .../chainsaw/skyhook/rest_test.sh | 0 .../skyhook/runtime-required/assert.yaml | 0 .../runtime-required/chainsaw-test.yaml | 0 .../skyhook/runtime-required/skyhook.yaml | 0 .../skyhook/simple-skyhook/assert.yaml | 0 .../skyhook/simple-skyhook/chainsaw-test.yaml | 0 .../skyhook/simple-skyhook/skyhook.yaml | 0 .../simple-update-skyhook/assert-update.yaml | 0 .../skyhook/simple-update-skyhook/assert.yaml | 0 .../simple-update-skyhook/chainsaw-test.yaml | 0 .../simple-update-skyhook/skyhook.yaml | 0 .../skyhook/simple-update-skyhook/update.yaml | 0 .../taint-scheduling/assert-update.yaml | 0 .../skyhook/taint-scheduling/assert.yaml | 0 .../taint-scheduling/chainsaw-test.yaml | 0 .../skyhook/taint-scheduling/skyhook.yaml | 0 .../taint-scheduling/update-skyhook.yaml | 0 .../assert-update-no-packages.yaml | 0 .../assert-update.yaml | 0 .../uninstall-upgrade-skyhook/assert.yaml | 0 .../chainsaw-test.yaml | 0 .../uninstall-upgrade-skyhook/skyhook.yaml | 0 .../update-no-packages.yaml | 0 .../uninstall-upgrade-skyhook/update.yaml | 0 .../validate-packages/assert-update.yaml | 0 .../skyhook/validate-packages/assert.yaml | 0 .../validate-packages/chainsaw-test.yaml | 0 .../skyhook/validate-packages/skyhook.yaml | 0 .../skyhook/validate-packages/update.yaml | 0 {e2e => k8s-tests}/readme.md | 2 +- .../migration_0.5.0/migration.sh | 0 78 files changed, 14 insertions(+), 18 deletions(-) rename {e2e => k8s-tests}/chainsaw/helm/helm-chart-test/assert-no-schedule.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-chart-test/assert-scheduled.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-chart-test/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-chart-test/values.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-scale-test/assert-override-resources.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-scale-test/assert-scaled-resources.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-scale-test/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-scale-test/values-scale.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/helm-scale-test/vaules-override-resources.yaml (100%) rename {e2e => k8s-tests}/chainsaw/helm/install-cert-manager.sh (100%) rename {e2e => k8s-tests}/chainsaw/helm/install-helm-chart.sh (100%) rename {e2e => k8s-tests}/chainsaw/helm/readme.md (100%) rename {e2e => k8s-tests}/chainsaw/helm/taint-nodes.sh (100%) rename {e2e => k8s-tests}/chainsaw/helm/uninstall-cert-manager.sh (100%) rename {e2e => k8s-tests}/chainsaw/helm/uninstall-helm-chart.sh (100%) rename {e2e => k8s-tests}/chainsaw/helm/untaint-nodes.sh (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/assert-update-no-interrupt.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/assert-update-while-running.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/assert-update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/update-no-interrupt.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/update-while-running.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/config-skyhook/update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/failure-skyhook/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/failure-skyhook/node-assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/failure-skyhook/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/hello-world/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/hello-world/configmap-assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/hello-world/configmap.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/interrupt-grouping/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/interrupt-grouping/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/interrupt-grouping/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/interrupt/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/interrupt/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/interrupt/pod.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/interrupt/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/nodes_add_taint.sh (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/nodes_remove_taint.sh (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/pod-finalizer/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/pod-finalizer/node-assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/pod-finalizer/pod.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/readme.md (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/rest_nodes.sh (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/rest_test.sh (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/runtime-required/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/runtime-required/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/runtime-required/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-skyhook/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-skyhook/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-skyhook/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-update-skyhook/assert-update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-update-skyhook/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-update-skyhook/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-update-skyhook/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/simple-update-skyhook/update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/taint-scheduling/assert-update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/taint-scheduling/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/taint-scheduling/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/taint-scheduling/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/taint-scheduling/update-skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update-no-packages.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/uninstall-upgrade-skyhook/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/uninstall-upgrade-skyhook/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/uninstall-upgrade-skyhook/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/uninstall-upgrade-skyhook/update-no-packages.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/uninstall-upgrade-skyhook/update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/validate-packages/assert-update.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/validate-packages/assert.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/validate-packages/chainsaw-test.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/validate-packages/skyhook.yaml (100%) rename {e2e => k8s-tests}/chainsaw/skyhook/validate-packages/update.yaml (100%) rename {e2e => k8s-tests}/readme.md (96%) rename {e2e => k8s-tests}/time_travel_tests/migration_0.5.0/migration.sh (100%) diff --git a/.github/workflows/agent-ci.yaml b/.github/workflows/agent-ci.yaml index a5972e8f..8b7458c0 100644 --- a/.github/workflows/agent-ci.yaml +++ b/.github/workflows/agent-ci.yaml @@ -17,22 +17,7 @@ jobs: contents: write steps: - uses: actions/checkout@v4 - - - name: Install everything, run the tests, produce the .coverage file + - name: Install everything, run the tests, produce the .coverage file and coverage.xml report run: | cd agent - make test - - name: Coverage comment - id: coverage_comment - uses: py-cov-action/python-coverage-comment-action@v3 - with: - COVERAGE_PATH: agent/ - GITHUB_TOKEN: ${{ github.token }} - - name: Store Pull Request comment to be posted - uses: actions/upload-artifact@v4 - if: steps.coverage_comment.outputs.COMMENT_FILE_WRITTEN == 'true' - with: - # If you use a different name, update COMMENT_ARTIFACT_NAME accordingly - name: python-coverage-comment-action - # If you use a different name, update COMMENT_FILENAME accordingly - path: python-coverage-comment-action.txt \ No newline at end of file + make test \ No newline at end of file diff --git a/agent/Makefile b/agent/Makefile index 9463e15a..310e88b9 100644 --- a/agent/Makefile +++ b/agent/Makefile @@ -50,6 +50,17 @@ build: ## Builds using hatch to `dist` $(VENV)hatch -p skyhook-agent version $(build_version) $(VENV)hatch -p skyhook-agent build -c +docker-setup: + test ! $($(DOCKER_CMD) context ls | grep builder) || $(DOCKER_CMD) context create builder; + $(DOCKER_CMD) buildx create --platform linux/amd64,linux/arm64 --use builder + $(DOCKER_CMD) run --privileged --rm tonistiigi/binfmt --install amd64,arm64 + +ACTUAL_TAGS=$(shell echo "-t $(REGISTRY)/$(AGENT_IMAGE):$(shell date +%y.%m.%d-%H%M%S)-$(COMMIT_SHORT_SHA) $(TAGS)" | tr A-Z a-z) +.PHONY: docker-build-only +docker-build-only: + @echo "Building skyhook-agent $(DOCKER_CMD) image with tags: $(ACTUAL_TAGS)" + $(DOCKER_CMD) buildx build $(BUILD_ARGS) --build-arg AGENT_VERSION=$(AGENT_VERSION) --platform linux/amd64,linux/arm64 $(ACTUAL_TAGS) --metadata-file=metadata.json -f ../containers/agent.Dockerfile . + ##@ Vendor .PHONY: vendor vendor: ## Uses Unearth to vendor all dependencies locally. diff --git a/e2e/chainsaw/helm/helm-chart-test/assert-no-schedule.yaml b/k8s-tests/chainsaw/helm/helm-chart-test/assert-no-schedule.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-chart-test/assert-no-schedule.yaml rename to k8s-tests/chainsaw/helm/helm-chart-test/assert-no-schedule.yaml diff --git a/e2e/chainsaw/helm/helm-chart-test/assert-scheduled.yaml b/k8s-tests/chainsaw/helm/helm-chart-test/assert-scheduled.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-chart-test/assert-scheduled.yaml rename to k8s-tests/chainsaw/helm/helm-chart-test/assert-scheduled.yaml diff --git a/e2e/chainsaw/helm/helm-chart-test/chainsaw-test.yaml b/k8s-tests/chainsaw/helm/helm-chart-test/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-chart-test/chainsaw-test.yaml rename to k8s-tests/chainsaw/helm/helm-chart-test/chainsaw-test.yaml diff --git a/e2e/chainsaw/helm/helm-chart-test/values.yaml b/k8s-tests/chainsaw/helm/helm-chart-test/values.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-chart-test/values.yaml rename to k8s-tests/chainsaw/helm/helm-chart-test/values.yaml diff --git a/e2e/chainsaw/helm/helm-scale-test/assert-override-resources.yaml b/k8s-tests/chainsaw/helm/helm-scale-test/assert-override-resources.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-scale-test/assert-override-resources.yaml rename to k8s-tests/chainsaw/helm/helm-scale-test/assert-override-resources.yaml diff --git a/e2e/chainsaw/helm/helm-scale-test/assert-scaled-resources.yaml b/k8s-tests/chainsaw/helm/helm-scale-test/assert-scaled-resources.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-scale-test/assert-scaled-resources.yaml rename to k8s-tests/chainsaw/helm/helm-scale-test/assert-scaled-resources.yaml diff --git a/e2e/chainsaw/helm/helm-scale-test/chainsaw-test.yaml b/k8s-tests/chainsaw/helm/helm-scale-test/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-scale-test/chainsaw-test.yaml rename to k8s-tests/chainsaw/helm/helm-scale-test/chainsaw-test.yaml diff --git a/e2e/chainsaw/helm/helm-scale-test/values-scale.yaml b/k8s-tests/chainsaw/helm/helm-scale-test/values-scale.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-scale-test/values-scale.yaml rename to k8s-tests/chainsaw/helm/helm-scale-test/values-scale.yaml diff --git a/e2e/chainsaw/helm/helm-scale-test/vaules-override-resources.yaml b/k8s-tests/chainsaw/helm/helm-scale-test/vaules-override-resources.yaml similarity index 100% rename from e2e/chainsaw/helm/helm-scale-test/vaules-override-resources.yaml rename to k8s-tests/chainsaw/helm/helm-scale-test/vaules-override-resources.yaml diff --git a/e2e/chainsaw/helm/install-cert-manager.sh b/k8s-tests/chainsaw/helm/install-cert-manager.sh similarity index 100% rename from e2e/chainsaw/helm/install-cert-manager.sh rename to k8s-tests/chainsaw/helm/install-cert-manager.sh diff --git a/e2e/chainsaw/helm/install-helm-chart.sh b/k8s-tests/chainsaw/helm/install-helm-chart.sh similarity index 100% rename from e2e/chainsaw/helm/install-helm-chart.sh rename to k8s-tests/chainsaw/helm/install-helm-chart.sh diff --git a/e2e/chainsaw/helm/readme.md b/k8s-tests/chainsaw/helm/readme.md similarity index 100% rename from e2e/chainsaw/helm/readme.md rename to k8s-tests/chainsaw/helm/readme.md diff --git a/e2e/chainsaw/helm/taint-nodes.sh b/k8s-tests/chainsaw/helm/taint-nodes.sh similarity index 100% rename from e2e/chainsaw/helm/taint-nodes.sh rename to k8s-tests/chainsaw/helm/taint-nodes.sh diff --git a/e2e/chainsaw/helm/uninstall-cert-manager.sh b/k8s-tests/chainsaw/helm/uninstall-cert-manager.sh similarity index 100% rename from e2e/chainsaw/helm/uninstall-cert-manager.sh rename to k8s-tests/chainsaw/helm/uninstall-cert-manager.sh diff --git a/e2e/chainsaw/helm/uninstall-helm-chart.sh b/k8s-tests/chainsaw/helm/uninstall-helm-chart.sh similarity index 100% rename from e2e/chainsaw/helm/uninstall-helm-chart.sh rename to k8s-tests/chainsaw/helm/uninstall-helm-chart.sh diff --git a/e2e/chainsaw/helm/untaint-nodes.sh b/k8s-tests/chainsaw/helm/untaint-nodes.sh similarity index 100% rename from e2e/chainsaw/helm/untaint-nodes.sh rename to k8s-tests/chainsaw/helm/untaint-nodes.sh diff --git a/e2e/chainsaw/skyhook/config-skyhook/assert-update-no-interrupt.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/assert-update-no-interrupt.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/assert-update-no-interrupt.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/assert-update-no-interrupt.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/assert-update-while-running.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/assert-update-while-running.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/assert-update-while-running.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/assert-update-while-running.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/assert-update.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/assert-update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/assert-update.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/assert-update.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/assert.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/assert.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/assert.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/skyhook.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/update-no-interrupt.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/update-no-interrupt.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/update-no-interrupt.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/update-no-interrupt.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/update-while-running.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/update-while-running.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/update-while-running.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/update-while-running.yaml diff --git a/e2e/chainsaw/skyhook/config-skyhook/update.yaml b/k8s-tests/chainsaw/skyhook/config-skyhook/update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/config-skyhook/update.yaml rename to k8s-tests/chainsaw/skyhook/config-skyhook/update.yaml diff --git a/e2e/chainsaw/skyhook/failure-skyhook/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/failure-skyhook/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/failure-skyhook/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/failure-skyhook/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/failure-skyhook/node-assert.yaml b/k8s-tests/chainsaw/skyhook/failure-skyhook/node-assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/failure-skyhook/node-assert.yaml rename to k8s-tests/chainsaw/skyhook/failure-skyhook/node-assert.yaml diff --git a/e2e/chainsaw/skyhook/failure-skyhook/skyhook.yaml b/k8s-tests/chainsaw/skyhook/failure-skyhook/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/failure-skyhook/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/failure-skyhook/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/hello-world/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/hello-world/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/hello-world/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/hello-world/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/hello-world/configmap-assert.yaml b/k8s-tests/chainsaw/skyhook/hello-world/configmap-assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/hello-world/configmap-assert.yaml rename to k8s-tests/chainsaw/skyhook/hello-world/configmap-assert.yaml diff --git a/e2e/chainsaw/skyhook/hello-world/configmap.yaml b/k8s-tests/chainsaw/skyhook/hello-world/configmap.yaml similarity index 100% rename from e2e/chainsaw/skyhook/hello-world/configmap.yaml rename to k8s-tests/chainsaw/skyhook/hello-world/configmap.yaml diff --git a/e2e/chainsaw/skyhook/interrupt-grouping/assert.yaml b/k8s-tests/chainsaw/skyhook/interrupt-grouping/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/interrupt-grouping/assert.yaml rename to k8s-tests/chainsaw/skyhook/interrupt-grouping/assert.yaml diff --git a/e2e/chainsaw/skyhook/interrupt-grouping/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/interrupt-grouping/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/interrupt-grouping/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/interrupt-grouping/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/interrupt-grouping/skyhook.yaml b/k8s-tests/chainsaw/skyhook/interrupt-grouping/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/interrupt-grouping/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/interrupt-grouping/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/interrupt/assert.yaml b/k8s-tests/chainsaw/skyhook/interrupt/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/interrupt/assert.yaml rename to k8s-tests/chainsaw/skyhook/interrupt/assert.yaml diff --git a/e2e/chainsaw/skyhook/interrupt/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/interrupt/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/interrupt/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/interrupt/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/interrupt/pod.yaml b/k8s-tests/chainsaw/skyhook/interrupt/pod.yaml similarity index 100% rename from e2e/chainsaw/skyhook/interrupt/pod.yaml rename to k8s-tests/chainsaw/skyhook/interrupt/pod.yaml diff --git a/e2e/chainsaw/skyhook/interrupt/skyhook.yaml b/k8s-tests/chainsaw/skyhook/interrupt/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/interrupt/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/interrupt/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/nodes_add_taint.sh b/k8s-tests/chainsaw/skyhook/nodes_add_taint.sh similarity index 100% rename from e2e/chainsaw/skyhook/nodes_add_taint.sh rename to k8s-tests/chainsaw/skyhook/nodes_add_taint.sh diff --git a/e2e/chainsaw/skyhook/nodes_remove_taint.sh b/k8s-tests/chainsaw/skyhook/nodes_remove_taint.sh similarity index 100% rename from e2e/chainsaw/skyhook/nodes_remove_taint.sh rename to k8s-tests/chainsaw/skyhook/nodes_remove_taint.sh diff --git a/e2e/chainsaw/skyhook/pod-finalizer/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/pod-finalizer/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/pod-finalizer/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/pod-finalizer/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/pod-finalizer/node-assert.yaml b/k8s-tests/chainsaw/skyhook/pod-finalizer/node-assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/pod-finalizer/node-assert.yaml rename to k8s-tests/chainsaw/skyhook/pod-finalizer/node-assert.yaml diff --git a/e2e/chainsaw/skyhook/pod-finalizer/pod.yaml b/k8s-tests/chainsaw/skyhook/pod-finalizer/pod.yaml similarity index 100% rename from e2e/chainsaw/skyhook/pod-finalizer/pod.yaml rename to k8s-tests/chainsaw/skyhook/pod-finalizer/pod.yaml diff --git a/e2e/chainsaw/skyhook/readme.md b/k8s-tests/chainsaw/skyhook/readme.md similarity index 100% rename from e2e/chainsaw/skyhook/readme.md rename to k8s-tests/chainsaw/skyhook/readme.md diff --git a/e2e/chainsaw/skyhook/rest_nodes.sh b/k8s-tests/chainsaw/skyhook/rest_nodes.sh similarity index 100% rename from e2e/chainsaw/skyhook/rest_nodes.sh rename to k8s-tests/chainsaw/skyhook/rest_nodes.sh diff --git a/e2e/chainsaw/skyhook/rest_test.sh b/k8s-tests/chainsaw/skyhook/rest_test.sh similarity index 100% rename from e2e/chainsaw/skyhook/rest_test.sh rename to k8s-tests/chainsaw/skyhook/rest_test.sh diff --git a/e2e/chainsaw/skyhook/runtime-required/assert.yaml b/k8s-tests/chainsaw/skyhook/runtime-required/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/runtime-required/assert.yaml rename to k8s-tests/chainsaw/skyhook/runtime-required/assert.yaml diff --git a/e2e/chainsaw/skyhook/runtime-required/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/runtime-required/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/runtime-required/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/runtime-required/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/runtime-required/skyhook.yaml b/k8s-tests/chainsaw/skyhook/runtime-required/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/runtime-required/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/runtime-required/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/simple-skyhook/assert.yaml b/k8s-tests/chainsaw/skyhook/simple-skyhook/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-skyhook/assert.yaml rename to k8s-tests/chainsaw/skyhook/simple-skyhook/assert.yaml diff --git a/e2e/chainsaw/skyhook/simple-skyhook/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/simple-skyhook/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-skyhook/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/simple-skyhook/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/simple-skyhook/skyhook.yaml b/k8s-tests/chainsaw/skyhook/simple-skyhook/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-skyhook/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/simple-skyhook/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/simple-update-skyhook/assert-update.yaml b/k8s-tests/chainsaw/skyhook/simple-update-skyhook/assert-update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-update-skyhook/assert-update.yaml rename to k8s-tests/chainsaw/skyhook/simple-update-skyhook/assert-update.yaml diff --git a/e2e/chainsaw/skyhook/simple-update-skyhook/assert.yaml b/k8s-tests/chainsaw/skyhook/simple-update-skyhook/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-update-skyhook/assert.yaml rename to k8s-tests/chainsaw/skyhook/simple-update-skyhook/assert.yaml diff --git a/e2e/chainsaw/skyhook/simple-update-skyhook/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/simple-update-skyhook/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-update-skyhook/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/simple-update-skyhook/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/simple-update-skyhook/skyhook.yaml b/k8s-tests/chainsaw/skyhook/simple-update-skyhook/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-update-skyhook/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/simple-update-skyhook/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/simple-update-skyhook/update.yaml b/k8s-tests/chainsaw/skyhook/simple-update-skyhook/update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/simple-update-skyhook/update.yaml rename to k8s-tests/chainsaw/skyhook/simple-update-skyhook/update.yaml diff --git a/e2e/chainsaw/skyhook/taint-scheduling/assert-update.yaml b/k8s-tests/chainsaw/skyhook/taint-scheduling/assert-update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/taint-scheduling/assert-update.yaml rename to k8s-tests/chainsaw/skyhook/taint-scheduling/assert-update.yaml diff --git a/e2e/chainsaw/skyhook/taint-scheduling/assert.yaml b/k8s-tests/chainsaw/skyhook/taint-scheduling/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/taint-scheduling/assert.yaml rename to k8s-tests/chainsaw/skyhook/taint-scheduling/assert.yaml diff --git a/e2e/chainsaw/skyhook/taint-scheduling/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/taint-scheduling/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/taint-scheduling/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/taint-scheduling/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/taint-scheduling/skyhook.yaml b/k8s-tests/chainsaw/skyhook/taint-scheduling/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/taint-scheduling/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/taint-scheduling/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/taint-scheduling/update-skyhook.yaml b/k8s-tests/chainsaw/skyhook/taint-scheduling/update-skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/taint-scheduling/update-skyhook.yaml rename to k8s-tests/chainsaw/skyhook/taint-scheduling/update-skyhook.yaml diff --git a/e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update-no-packages.yaml b/k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update-no-packages.yaml similarity index 100% rename from e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update-no-packages.yaml rename to k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update-no-packages.yaml diff --git a/e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update.yaml b/k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update.yaml rename to k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/assert-update.yaml diff --git a/e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/assert.yaml b/k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/assert.yaml rename to k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/assert.yaml diff --git a/e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/skyhook.yaml b/k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/update-no-packages.yaml b/k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/update-no-packages.yaml similarity index 100% rename from e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/update-no-packages.yaml rename to k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/update-no-packages.yaml diff --git a/e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/update.yaml b/k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/uninstall-upgrade-skyhook/update.yaml rename to k8s-tests/chainsaw/skyhook/uninstall-upgrade-skyhook/update.yaml diff --git a/e2e/chainsaw/skyhook/validate-packages/assert-update.yaml b/k8s-tests/chainsaw/skyhook/validate-packages/assert-update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/validate-packages/assert-update.yaml rename to k8s-tests/chainsaw/skyhook/validate-packages/assert-update.yaml diff --git a/e2e/chainsaw/skyhook/validate-packages/assert.yaml b/k8s-tests/chainsaw/skyhook/validate-packages/assert.yaml similarity index 100% rename from e2e/chainsaw/skyhook/validate-packages/assert.yaml rename to k8s-tests/chainsaw/skyhook/validate-packages/assert.yaml diff --git a/e2e/chainsaw/skyhook/validate-packages/chainsaw-test.yaml b/k8s-tests/chainsaw/skyhook/validate-packages/chainsaw-test.yaml similarity index 100% rename from e2e/chainsaw/skyhook/validate-packages/chainsaw-test.yaml rename to k8s-tests/chainsaw/skyhook/validate-packages/chainsaw-test.yaml diff --git a/e2e/chainsaw/skyhook/validate-packages/skyhook.yaml b/k8s-tests/chainsaw/skyhook/validate-packages/skyhook.yaml similarity index 100% rename from e2e/chainsaw/skyhook/validate-packages/skyhook.yaml rename to k8s-tests/chainsaw/skyhook/validate-packages/skyhook.yaml diff --git a/e2e/chainsaw/skyhook/validate-packages/update.yaml b/k8s-tests/chainsaw/skyhook/validate-packages/update.yaml similarity index 100% rename from e2e/chainsaw/skyhook/validate-packages/update.yaml rename to k8s-tests/chainsaw/skyhook/validate-packages/update.yaml diff --git a/e2e/readme.md b/k8s-tests/readme.md similarity index 96% rename from e2e/readme.md rename to k8s-tests/readme.md index ea76fa11..6b4a029d 100644 --- a/e2e/readme.md +++ b/k8s-tests/readme.md @@ -12,7 +12,7 @@ Due to some limitatations it can be hard to test circumstances where a node will 1. Run `make create-kind-cluster`, and wait for local cluster to be brought up. 2. Run `make install` to install the skyhook CRD into the cluster. 3. Use vscode's debugger in order to run the operator with your local cluster. -4. Use `kubectl apply -f e2e/chainsaw/simple-skyhook/skyhook.yaml` to define a skyhook. +4. Use `kubectl apply -f k8s-tests/chainsaw/simple-skyhook/skyhook.yaml` to define a skyhook. 5. You can then use `kubectl` or `k9s` in order to overview the state of the skyhook as well as it's resources. In this instance we are looking for the configmap named `{skyhook.Name}-{node.Name}-metadata`. 6. Now that we can see that the configmap exists we can remove the node to see if the configmap will be deleted accordingly. We'll do so with the command `kubectl delete node {node.Name}`. 7. Now check to see whether the configmap named `{skyhook.Name}-{node.Name}-metadata` still exists and if it doesn't then everything is working. diff --git a/e2e/time_travel_tests/migration_0.5.0/migration.sh b/k8s-tests/time_travel_tests/migration_0.5.0/migration.sh similarity index 100% rename from e2e/time_travel_tests/migration_0.5.0/migration.sh rename to k8s-tests/time_travel_tests/migration_0.5.0/migration.sh