Merge pull request kubernetes-sigs#4154 from camilamacedo86/enhance-ci

🌱 ci:  add e2e tests for multigroup testdata layout and rename sample

Author: k8s-ci-robot

.github/workflows/test-e2e-samples.yml

@@ -1,17 +1,20 @@
-name: Testing E2E Sample
+name: E2E Testdata Sample
 
 on:
   push:
-    paths-ignore:
-      - '**/*.md'
+    paths:
+      - 'testdata/**'
+      - '.github/workflows/test-e2e-samples.yml'
   pull_request:
-    paths-ignore:
-      - '**/*.md'
+    paths:
+      - 'testdata/**'
+      - '.github/workflows/test-e2e-samples.yml'
 
 jobs:
-  e2e-tests:
+  e2e-tests-project-v4:
     runs-on: ubuntu-latest
-    # Pull requests from the same repository won't trigger this checks as they were already triggered by the push
+    strategy:
+      fail-fast: true
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     steps:
       - name: Checkout repository
@@ -48,8 +51,28 @@ jobs:
         run: |
           make test-e2e
 
-      - name: Teardown kind cluster
-        run: kind delete cluster
+  e2e-tests-project-v4-with-plugins:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '~1.22'
+
+      - name: Install the latest version of kind
+        run: |
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
+          chmod +x ./kind
+          sudo mv ./kind /usr/local/bin/kind
+
+      - name: Verify kind installation
+        run: kind version
 
       - name: Create kind cluster
         run: kind create cluster
@@ -62,7 +85,6 @@ jobs:
           # Uncomment only ValidatingWebhookConfiguration
           # from cert-manager replaces
           sed -i '55,70s/^#//' $KUSTOMIZATION_FILE_PATH
-          sed -i '55,70s/^#//' $KUSTOMIZATION_FILE_PATH
           sed -i '79,101s/^#//' $KUSTOMIZATION_FILE_PATH
           sed -i '110,151s/^#//' $KUSTOMIZATION_FILE_PATH
           # Comment the injection for MutatingWebhookConfiguration
@@ -74,6 +96,46 @@ jobs:
           go mod tidy
 
       - name: Testing make test-e2e for project-v4-with-plugins
-        working-directory: testdata/project-v4-with-plugins
+        working-directory: testdata/project-v4-with-plugins/
         run: |
           make test-e2e
+
+  e2e-tests-project-v4-multigroup:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '~1.22'
+
+      - name: Install the latest version of kind
+        run: |
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
+          chmod +x ./kind
+          sudo mv ./kind /usr/local/bin/kind
+
+      - name: Verify kind installation
+        run: kind version
+
+      - name: Create kind cluster
+        run: kind create cluster
+
+      - name: Prepare project-v4-multigroup
+        run: |
+          KUSTOMIZATION_FILE_PATH="testdata/project-v4-multigroup/config/default/kustomization.yaml"
+          sed -i '25s/^#//' $KUSTOMIZATION_FILE_PATH
+          sed -i '51s/^#//' $KUSTOMIZATION_FILE_PATH
+          sed -i '55,151s/^#//' $KUSTOMIZATION_FILE_PATH
+          cd testdata/project-v4-multigroup
+          go mod tidy
+
+      - name: Testing make test-e2e for project-v4-multigroup
+        working-directory: testdata/project-v4-multigroup/
+        run: |
+          make test-e2e          

test/testdata/generate.sh

@@ -80,7 +80,9 @@ function scaffold_test_project {
     $kb edit --plugins=grafana.kubebuilder.io/v1-alpha
   fi
 
+  make all
   make build-installer
+  # To avoid conflicts
   rm -f go.sum
   go mod tidy
   popd
@@ -89,5 +91,5 @@ function scaffold_test_project {
 build_kb
 
 scaffold_test_project project-v4 --plugins="go/v4"
-scaffold_test_project project-v4-multigroup-with-plugins --plugins="go/v4"
+scaffold_test_project project-v4-multigroup --plugins="go/v4"
 scaffold_test_project project-v4-with-plugins --plugins="go/v4"

test/testdata/test.sh

@@ -32,5 +32,5 @@ build_kb
 
 # Project version v4-alpha
 test_project project-v4
-test_project project-v4-multigroup-with-plugins
+test_project project-v4-multigroup
 test_project project-v4-with-plugins

testdata/project-v4-multigroup-with-plugins/.devcontainer/devcontainer.json renamed to testdata/project-v4-multigroup/.devcontainer/devcontainer.json

@@ -120,10 +120,10 @@ PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
 docker-buildx: ## Build and push docker image for the manager for cross-platform support
 	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
 	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
-	- $(CONTAINER_TOOL) buildx create --name project-v4-multigroup-with-plugins-builder
-	$(CONTAINER_TOOL) buildx use project-v4-multigroup-with-plugins-builder
+	- $(CONTAINER_TOOL) buildx create --name project-v4-multigroup-builder
+	$(CONTAINER_TOOL) buildx use project-v4-multigroup-builder
 	- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
-	- $(CONTAINER_TOOL) buildx rm project-v4-multigroup-with-plugins-builder
+	- $(CONTAINER_TOOL) buildx rm project-v4-multigroup-builder
 	rm Dockerfile.cross
 
 .PHONY: build-installer