Change vars setting

Signed-off-by: Yuri Sa <[email protected]>

Author: yuriolisa

.chainsaw.yaml

@@ -0,0 +1,12 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/configuration-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Configuration
+metadata:
+  name: configuration
+spec:
+  parallel: 4
+  timeouts:
+    assert: 5m0s
+    cleanup: 5m0s
+    delete: 5m0s
+    error: 5m0s

.chloggen/fix_2589-watch-single-namespace.yaml

@@ -15,7 +15,6 @@ body:
       description: Which component(s) does your bug report concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator

.chloggen/per-node-allocation-strategy.yaml

@@ -9,7 +9,6 @@ body:
       description: Which component(s) does your feature request concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -9,7 +9,6 @@ body:
       description: Which component(s) does your issue concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -2,7 +2,9 @@
 <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
 Ex. Adding a feature - Explain what this achieves.-->
 
-**Link to tracking Issue:** <Issue number if applicable>
+**Link to tracking Issue(s):** <Issue number if applicable>
+
+- Resolves: #issue-number
 
 **Testing:** <Describe what testing was performed and which tests were added.>
 

.github/ISSUE_TEMPLATE/other.yaml

@@ -12,7 +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
@@ -25,13 +24,13 @@ jobs:
          - "1.29"
        group:
          - e2e
-         - e2e-instrumentation
-         - e2e-upgrade
          - e2e-autoscale
-         - e2e-pdb
+         - e2e-instrumentation
          - e2e-opampbridge
-         - e2e-targetallocator
+         - e2e-pdb
          - e2e-prometheuscr
+         - e2e-targetallocator
+         - e2e-upgrade
          - e2e-multi-instrumentation
        include:
          - group: e2e-prometheuscr
@@ -42,33 +41,38 @@ jobs:
     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 chainsaw
+      uses: kyverno/[email protected]
     - name: Install tools
       run: make install-tools
-
-    - name: "run tests"
+    - name: Prepare e2e tests
       env:
         KUBE_VERSION: ${{ matrix.kube-version }}
       run: |
+        set -e
         make ${{ matrix.setup != '' && matrix.setup || 'prepare-e2e' }} KUBE_VERSION=$KUBE_VERSION VERSION=e2e
+    - name: Run e2e tests
+      env:
+        KUBE_VERSION: ${{ matrix.kube-version }}
+      run: |
+        set -e
         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
+      run: |
+        set -e
+        make e2e-log-operator KUBE_VERSION=$KUBE_VERSION
 
   e2e-tests-check:
     runs-on: ubuntu-22.04

.github/pull_request_template.md

@@ -2,6 +2,37 @@ Changes by Version
 ==================
 <!-- next version -->
 
+## 0.94.0
+
+### 💡 Enhancements 💡
+
+- `target allocator`: Add new "per node" allocation strategy to target allocator. This strategy will allocate targets to nodes on which given target resides.  It should only be used conjunction with the daemonset mode. (#1828)
+
+### 🧰 Bug fixes 🧰
+
+- `operator`: Fixed handling of protocol in exposed ports. (#2619)
+  Make distinction not only on the port number, but also on protocol. This fix allows to have multiple exposed
+  ServicePorts with the same port number, but different protocols.
+  
+- `operator`: Fixed handling of exposed port protocol in syslog, tcplog and udplog receivers. (#767, #2619)
+  Please note that the operator currently exposes just one port (tcp or udp) of syslog receiver due to the current
+  receiver implementation (patches are welcome).
+  
+- `operator`: Fixing WATCH_NAMESPACE for a single namespace value (#2589)
+
+### Components
+
+* [OpenTelemetry Collector - v0.94.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.94.0)
+* [OpenTelemetry Contrib - v0.94.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.94.0)
+* [Java auto-instrumentation - 1.32.1](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.32.1)
+* [.NET auto-instrumentation - 1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/1.2.0)
+* [Node.JS - 0.46.0](https://github.com/open-telemetry/opentelemetry-js-contrib/releases/tag/auto-instrumentations-node-0.46.0)
+* [Python - 0.43b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/0.43b0)
+* [Go - v0.10.1-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.10.1-alpha)
+* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+
+
 ## 0.93.0
 
 ### 🛑 Breaking changes 🛑

.github/workflows/e2e.yaml

@@ -118,13 +118,13 @@ 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.
+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 set up 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`.
+To revert the changes made by the `make prepare-e2e` run `make reset`.
 
 ### OpenShift End to End tests
 To run the end-to-end tests written for OpenShift, you'll need a OpenShift cluster. 
@@ -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
 

CHANGELOG.md

@@ -197,39 +197,18 @@ generate: controller-gen
 
 # 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
+e2e: chainsaw
+	$(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
+e2e-autoscale: chainsaw
+	$(CHAINSAW) test --test-dir ./tests/e2e-autoscale
 
-# end-to-end-test for testing pdb support
-.PHONY: e2e-pdb
-e2e-pdb:
-	$(KUTTL) test --config kuttl-test-pdb.yaml
-
-# 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
+	$(CHAINSAW) test --test-dir ./tests/e2e-instrumentation
 
 .PHONY: e2e-log-operator
 e2e-log-operator:
@@ -238,24 +217,41 @@ e2e-log-operator:
 
 # end-to-tests for multi-instrumentation
 .PHONY: e2e-multi-instrumentation
-e2e-multi-instrumentation:
-	$(KUTTL) test --config kuttl-test-multi-instr.yaml
+e2e-multi-instrumentation: chainsaw
+	$(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
+e2e-opampbridge: chainsaw
+	$(CHAINSAW) test --test-dir ./tests/e2e-opampbridge
+
+# end-to-end-test for testing pdb support
+.PHONY: e2e-pdb
+e2e-pdb: chainsaw
+	$(CHAINSAW) test --test-dir ./tests/e2e-pdb
+
+# end-to-end-test for PrometheusCR E2E tests
+.PHONY: e2e-prometheuscr
+e2e-prometheuscr: chainsaw
+	$(CHAINSAW) test --test-dir ./tests/e2e-prometheuscr
 
 # Target allocator end-to-tests
 .PHONY: e2e-targetallocator
-e2e-targetallocator:
-	$(KUTTL) test --config kuttl-test-targetallocator.yaml
+e2e-targetallocator: chainsaw
+	$(CHAINSAW) test --test-dir ./tests/e2e-targetallocator
+
+# end-to-end-test for testing upgrading
+.PHONY: e2e-upgrade
+e2e-upgrade: undeploy chainsaw
+	kubectl apply -f ./tests/e2e-upgrade/upgrade-test/opentelemetry-operator-v0.86.0.yaml
+	go run hack/check-operator-ready.go
+	$(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: chainsaw 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: chainsaw enable-operator-featuregates prepare-e2e
 
 .PHONY: scorecard-tests
 scorecard-tests: operator-sdk
@@ -361,20 +357,20 @@ cmctl:
 
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
 KIND ?= $(LOCALBIN)/kind
-KUTTL ?= $(LOCALBIN)/kubectl-kuttl
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 CHLOGGEN ?= $(LOCALBIN)/chloggen
 GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
+CHAINSAW ?= $(LOCALBIN)/chainsaw
 
 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
+CHAINSAW_VERSION ?= v0.1.4
 
 .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 chainsaw
 
 .PHONY: kustomize
 kustomize: ## Download kustomize locally if necessary.
@@ -403,6 +399,10 @@ CRDOC = $(shell pwd)/bin/crdoc
 crdoc: ## Download crdoc locally if necessary.
 	$(call go-get-tool,$(CRDOC), fybrik.io/crdoc,v0.5.2)
 
+.PHONY: chainsaw
+chainsaw: ## Find or download chainsaw
+	$(call go-get-tool,$(CHAINSAW), github.com/kyverno/chainsaw,$(CHAINSAW_VERSION))
+
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 define go-get-tool
@@ -418,10 +418,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)
@@ -451,6 +447,7 @@ reset: kustomize operator-sdk manifests
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version ${OPERATOR_VERSION} $(BUNDLE_METADATA_OPTS)
 	$(OPERATOR_SDK) bundle validate ./bundle
 	./hack/ignore-createdAt-bundle.sh
+	./hack/add-openshift-annotations.sh
 	git checkout config/manager/kustomization.yaml
 
 # Build the bundle image, used only for local dev purposes

CONTRIBUTING.md

@@ -710,6 +710,7 @@ The OpenTelemetry Operator *might* work on versions outside of the given range,
 
 | OpenTelemetry Operator | Kubernetes           | Cert-Manager        |
 |------------------------|----------------------|---------------------|
+| v0.94.0                | v1.23 to v1.29       | v1                  |
 | v0.93.0                | v1.23 to v1.29       | v1                  |
 | v0.92.0                | v1.23 to v1.29       | v1                  |
 | v0.91.0                | v1.23 to v1.29       | v1                  |
@@ -732,7 +733,6 @@ The OpenTelemetry Operator *might* work on versions outside of the given range,
 | v0.74.0                | v1.19 to v1.26       | v1                  |
 | v0.73.0                | v1.19 to v1.26       | v1                  |
 | v0.72.0                | v1.19 to v1.26       | v1                  |
-| v0.71.0                | v1.19 to v1.25       | v1                  |
 
 ## Contributing and Developing
 

Makefile

@@ -40,10 +40,10 @@ The operator should be released within a week after the [OpenTelemetry collector
 
 | Version  | Release manager |
 |----------|-----------------|
-| v0.94.0  | @TylerHelmuth   |
 | v0.95.0  | @swiatekm-sumo  |
 | v0.96.0  | @frzifus        |
 | v0.97.0  | @jaronoff97     |
 | v0.98.0  | @yuriolisa      |
 | v0.99.0  | @pavolloffay    |
 | v0.100.0 | @VineethReddy02 |
+| v0.101.0 | @TylerHelmuth   |