From 9080fe4177f527a73713d0aa5d4893163cacdbb8 Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Tue, 15 Aug 2023 13:27:00 +0300 Subject: [PATCH] e2e: drop custom kind node image The node image does not need dbus installed anymore after we moved to use host systemctl so the vanilla kind node image works fine again. Signed-off-by: Mikko Ylinen --- .github/workflows/e2e.yaml | 9 +-------- .github/workflows/enclave-cc-cicd.yaml | 9 +-------- tests/e2e/kind/Dockerfile | 10 ---------- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 tests/e2e/kind/Dockerfile diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 1780cc4e..33f1170d 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -40,16 +40,9 @@ jobs: env: REGISTRY: localhost:5000/reqs-payload - - name: Build custom kind node image - uses: docker/build-push-action@v4 - with: - context: tests/e2e/kind - load: true - tags: kindest/node:v1.27.3-coco - - name: Setup kind cluster run: | - kind create cluster --image "kindest/node:v1.27.3-coco" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s + kind create cluster --image "kindest/node:v1.27.3" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s kubectl label node coco-sgx-worker node.kubernetes.io/worker= docker network connect kind registry diff --git a/.github/workflows/enclave-cc-cicd.yaml b/.github/workflows/enclave-cc-cicd.yaml index cc8d216d..0c334292 100644 --- a/.github/workflows/enclave-cc-cicd.yaml +++ b/.github/workflows/enclave-cc-cicd.yaml @@ -30,16 +30,9 @@ jobs: env: IMG: localhost:5000/cc-operator:latest - - name: Build custom kind node image - uses: docker/build-push-action@v4 - with: - context: tests/e2e/kind - load: true - tags: kindest/node:v1.27.3-coco - - name: Setup kind cluster run: | - kind create cluster --image "kindest/node:v1.27.3-coco" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s + kind create cluster --image "kindest/node:v1.27.3" -n coco-sgx --config tests/e2e/enclave-cc-kind-config.yaml --wait 120s kubectl label node coco-sgx-worker node.kubernetes.io/worker= - name: Deploy operator from the local registry diff --git a/tests/e2e/kind/Dockerfile b/tests/e2e/kind/Dockerfile deleted file mode 100644 index fc1546c8..00000000 --- a/tests/e2e/kind/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -ARG IMAGE=kindest/node -ARG VERSION=1.27 -ARG MINOR=3 - -FROM ${IMAGE}:v${VERSION}.${MINOR} - -RUN echo "Installing Packages ..." \ - && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dbus \ - && systemctl enable dbus