cleanup

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

Author: eddycharly

.github/workflows/e2e.yaml

@@ -12,82 +12,6 @@ concurrency:
 
 jobs:
   e2e-tests:
-    name: End-to-end tests ${{ matrix.group }} on K8s ${{ matrix.kube-version }}
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-       # The e2e tests are run on the lowest and highest supported k8s version.
-       # All Kubernetes version in between expose the same APIs, hence the operator
-       # should be compatible with them.
-       kube-version:
-         - "1.23"
-         - "1.29"
-       group: []
-        #  - e2e
-        #  - e2e-instrumentation
-        #  - e2e-upgrade
-        #  - e2e-autoscale
-        #  - e2e-pdb
-        #  - e2e-opampbridge
-        #  - e2e-prometheuscr
-        #  - e2e-targetallocator
-        #  - e2e-multi-instrumentation
-       include:
-         - group: e2e-prometheuscr
-           setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.observability.prometheus"
-         - group: e2e-multi-instrumentation
-           setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.autoinstrumentation.multi-instrumentation"
-
-    steps:
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v4
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: "~1.21.3"
-
-    - name: Cache tools
-      uses: actions/cache@v4
-      with:
-        path: bin
-        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
-
-    - name: Install tools
-      run: make install-tools
-
-    - name: "run tests"
-      env:
-        KUBE_VERSION: ${{ matrix.kube-version }}
-      run: |
-        make ${{ matrix.setup != '' && matrix.setup || 'prepare-e2e' }} KUBE_VERSION=$KUBE_VERSION VERSION=e2e
-        make ${{ matrix.group }}
-
-    - name: "log operator if failed"
-      if: ${{ failure() }}
-      env:
-        KUBE_VERSION: ${{ matrix.kube-version }}
-      run: make e2e-log-operator KUBE_VERSION=$KUBE_VERSION
-
-  e2e-tests-check:
-    runs-on: ubuntu-22.04
-    if: always()
-    needs: [e2e-tests]
-    steps:
-      - name: Print result
-        run: echo ${{ needs.e2e-tests.result }}
-      - name: Interpret result
-        run: |
-          if [[ success == ${{ needs.e2e-tests.result }} ]]
-          then
-            echo "All matrix jobs passed!"
-          else
-            echo "One or more matrix jobs failed."
-            false
-          fi
-
-  chainsaw-tests:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -141,11 +65,28 @@ jobs:
         KUBE_VERSION: ${{ matrix.kube-version }}
       run: |
         set -e
-        make chainsaw-${{ matrix.group }}
+        make ${{ matrix.group }}
     - name: "log operator if failed"
       if: ${{ failure() }}
       env:
         KUBE_VERSION: ${{ matrix.kube-version }}
       run: |
         set -e
         make e2e-log-operator KUBE_VERSION=$KUBE_VERSION
+
+  e2e-tests-check:
+    runs-on: ubuntu-22.04
+    if: always()
+    needs: [e2e-tests]
+    steps:
+      - name: Print result
+        run: echo ${{ needs.e2e-tests.result }}
+      - name: Interpret result
+        run: |
+          if [[ success == ${{ needs.e2e-tests.result }} ]]
+          then
+            echo "All matrix jobs passed!"
+          else
+            echo "One or more matrix jobs failed."
+            false
+          fi

CONTRIBUTING.md

@@ -118,11 +118,11 @@ KUBEBUILDER_ASSETS=$(./bin/setup-envtest use -p path 1.23) go test ./pkg...
 
 ### End to end tests
 
-To run the end-to-end tests, you'll need [`kind`](https://kind.sigs.k8s.io) and [`kuttl`](https://kuttl.dev). Refer to their documentation for installation instructions.
+To run the end-to-end tests, you'll need [`kind`](https://kind.sigs.k8s.io) and [`chainsaw`](https://kyverno.github.io/chainsaw). Refer to their documentation for installation instructions.
 
 Once they are installed, the tests can be executed with `make prepare-e2e`, which will build an image to use with the tests, followed by `make e2e`. Each call to the `e2e` target will setup a fresh `kind` cluster, making it safe to be executed multiple times with a single `prepare-e2e` step.
 
-The tests are located under `tests/e2e` and are written to be used with `kuttl`. Refer to their documentation to understand how tests are written.
+The tests are located under `tests/e2e` and are written to be used with `chainsaw`. Refer to their documentation to understand how tests are written.
 
 To evert the changes made by the `make prepare-e2e` run `make reset`.
 
@@ -133,7 +133,7 @@ To install the OpenTelemetry operator, please follow the instructions in  [Opera
 
 Once the operator is installed, the tests can be executed using `make e2e-openshift`, which will call to the `e2e-openshift` target. Note that `kind` is disabled for the TestSuite as the requirement is to use an OpenShift cluster for these test cases. 
 
-The tests are located under `tests/e2e-openshift` and are written to be used with `kuttl`.
+The tests are located under `tests/e2e-openshift` and are written to be used with `chainsaw`.
 
 ### Undeploying the operator from the local cluster
 

Makefile

@@ -195,44 +195,20 @@ lint: golangci-lint
 generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
-#########
-# KUTTL #
-#########
-
 # end-to-tests
 .PHONY: e2e
 e2e:
-	$(KUTTL) test
-
-# instrumentation end-to-tests
-.PHONY: e2e-instrumentation
-e2e-instrumentation:
-	$(KUTTL) test --config kuttl-test-instrumentation.yaml
-
-# end-to-end-test for PrometheusCR E2E tests
-.PHONY: e2e-prometheuscr
-e2e-prometheuscr:
-	$(KUTTL) test --config kuttl-test-prometheuscr.yaml
-
-# end-to-end-test for testing upgrading
-.PHONY: e2e-upgrade
-e2e-upgrade: undeploy
-	$(KUTTL) test --config kuttl-test-upgrade.yaml
+	chainsaw test --test-dir ./tests/e2e
 
 # end-to-end-test for testing autoscale
 .PHONY: e2e-autoscale
 e2e-autoscale:
-	$(KUTTL) test --config kuttl-test-autoscale.yaml
-
-# end-to-end-test for testing pdb support
-.PHONY: e2e-pdb
-e2e-pdb:
-	$(KUTTL) test --config kuttl-test-pdb.yaml
+	chainsaw test --test-dir ./tests/e2e-autoscale
 
-# end-to-end-test for testing OpenShift cases
-.PHONY: e2e-openshift
-e2e-openshift:
-	$(KUTTL) test --config kuttl-test-openshift.yaml
+# instrumentation end-to-tests
+.PHONY: e2e-instrumentation
+e2e-instrumentation:
+	chainsaw test --test-dir ./tests/e2e-instrumentation
 
 .PHONY: e2e-log-operator
 e2e-log-operator:
@@ -242,72 +218,38 @@ e2e-log-operator:
 # end-to-tests for multi-instrumentation
 .PHONY: e2e-multi-instrumentation
 e2e-multi-instrumentation:
-	$(KUTTL) test --config kuttl-test-multi-instr.yaml
+	chainsaw test --test-dir ./tests/e2e-multi-instrumentation
 
 # OpAMPBridge CR end-to-tests
 .PHONY: e2e-opampbridge
 e2e-opampbridge:
-	$(KUTTL) test --config kuttl-test-opampbridge.yaml
-
-# Target allocator end-to-tests
-.PHONY: e2e-targetallocator
-e2e-targetallocator:
-	$(KUTTL) test --config kuttl-test-targetallocator.yaml
-
-############
-# CHAINSAW #
-############
-
-# end-to-tests
-.PHONY: chainsaw-e2e
-chainsaw-e2e:
-	chainsaw test --test-dir ./tests/e2e
-
-# end-to-end-test for testing autoscale
-.PHONY: chainsaw-e2e-autoscale
-chainsaw-e2e-autoscale:
-	chainsaw test --test-dir ./tests/e2e-autoscale
-
-# instrumentation end-to-tests
-.PHONY: chainsaw-e2e-instrumentation
-chainsaw-e2e-instrumentation:
-	chainsaw test --test-dir ./tests/e2e-instrumentation
-
-# end-to-tests for multi-instrumentation
-.PHONY: chainsaw-e2e-multi-instrumentation
-chainsaw-e2e-multi-instrumentation:
-	chainsaw test --test-dir ./tests/e2e-multi-instrumentation
-
-# OpAMPBridge CR end-to-tests
-.PHONY: chainsaw-e2e-opampbridge
-chainsaw-e2e-opampbridge:
 	chainsaw test --test-dir ./tests/e2e-opampbridge
 
 # end-to-end-test for testing pdb support
-.PHONY: chainsaw-e2e-pdb
-chainsaw-e2e-pdb:
+.PHONY: e2e-pdb
+e2e-pdb:
 	chainsaw test --test-dir ./tests/e2e-pdb
 
 # end-to-end-test for PrometheusCR E2E tests
-.PHONY: chainsaw-e2e-prometheuscr
-chainsaw-e2e-prometheuscr:
+.PHONY: e2e-prometheuscr
+e2e-prometheuscr:
 	chainsaw test --test-dir ./tests/e2e-prometheuscr
 
 # Target allocator end-to-tests
-.PHONY: chainsaw-e2e-targetallocator
-chainsaw-e2e-targetallocator:
+.PHONY: e2e-targetallocator
+e2e-targetallocator:
 	chainsaw test --test-dir ./tests/e2e-targetallocator
 
 # end-to-end-test for testing upgrading
-.PHONY: chainsaw-e2e-upgrade
-chainsaw-e2e-upgrade: undeploy
+.PHONY: e2e-upgrade
+e2e-upgrade: undeploy
 	chainsaw test --test-dir ./tests/e2e-upgrade
 
 .PHONY: prepare-e2e
-prepare-e2e: kuttl set-image-controller add-image-targetallocator add-image-opampbridge container container-target-allocator container-operator-opamp-bridge start-kind cert-manager install-metrics-server install-targetallocator-prometheus-crds load-image-all deploy
+prepare-e2e: set-image-controller add-image-targetallocator add-image-opampbridge container container-target-allocator container-operator-opamp-bridge start-kind cert-manager install-metrics-server install-targetallocator-prometheus-crds load-image-all deploy
 
 .PHONY: prepare-e2e-with-featuregates
-prepare-e2e-with-featuregates: kuttl enable-operator-featuregates prepare-e2e
+prepare-e2e-with-featuregates: enable-operator-featuregates prepare-e2e
 
 .PHONY: scorecard-tests
 scorecard-tests: operator-sdk
@@ -413,7 +355,6 @@ cmctl:
 
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
 KIND ?= $(LOCALBIN)/kind
-KUTTL ?= $(LOCALBIN)/kubectl-kuttl
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 CHLOGGEN ?= $(LOCALBIN)/chloggen
@@ -423,10 +364,9 @@ KUSTOMIZE_VERSION ?= v5.0.3
 CONTROLLER_TOOLS_VERSION ?= v0.12.0
 GOLANGCI_LINT_VERSION ?= v1.54.0
 KIND_VERSION ?= v0.20.0
-KUTTL_VERSION ?= 0.15.0
 
 .PHONY: install-tools
-install-tools: kustomize golangci-lint kind controller-gen envtest crdoc kuttl kind operator-sdk
+install-tools: kustomize golangci-lint kind controller-gen envtest crdoc kind operator-sdk
 
 .PHONY: kustomize
 kustomize: ## Download kustomize locally if necessary.
@@ -470,10 +410,6 @@ rm -rf $$TMP_DIR ;\
 }
 endef
 
-.PHONY: kuttl
-kuttl: $(LOCALBIN)
-	@KUTTL=$(KUTTL) KUTTL_VERSION=$(KUTTL_VERSION) ./hack/install-kuttl.sh
-
 OPERATOR_SDK = $(shell pwd)/bin/operator-sdk
 .PHONY: operator-sdk
 operator-sdk: $(LOCALBIN)