diff --git a/Makefile b/Makefile index d217a2d784..3a8396009a 100644 --- a/Makefile +++ b/Makefile @@ -304,7 +304,7 @@ e2e-prometheuscr: chainsaw # Target allocator end-to-tests .PHONY: e2e-targetallocator e2e-targetallocator: chainsaw - $(CHAINSAW) test --apply-timeout 45s --assert-timeout 45s --cleanup-timeout 45s --delete-timeout 45s --error-timeout 45s --exec-timeout 45s --test-dir ./tests/e2e-targetallocator + $(CHAINSAW) test --test-dir ./tests/e2e-targetallocator # end-to-end-test for Annotations/Labels Filters .PHONY: e2e-metadata-filters diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index c90abd3b0b..5c5f0b84cb 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,21 +1,2 @@ resources: - manager.yaml -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -images: -- name: controller - newName: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - newTag: 0.107.0-47-g8719954d -patches: -- patch: '[{"op":"add","path":"/spec/template/spec/containers/0/args/-","value":"--target-allocator-image=ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:ve2e-targetallocator"}]' - target: - kind: Deployment -- patch: '[{"op":"add","path":"/spec/template/spec/containers/0/args/-","value":"--operator-opamp-bridge-image=ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge:ve2e-targetallocator"}]' - target: - kind: Deployment -- patch: '[{"op":"add","path":"/spec/template/spec/containers/0/args/-","value":"--target-allocator-image=ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:v0.107.0-47-g8719954d"}]' - target: - kind: Deployment -- patch: '[{"op":"add","path":"/spec/template/spec/containers/0/args/-","value":"--operator-opamp-bridge-image=ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge:v0.107.0-47-g8719954d"}]' - target: - kind: Deployment diff --git a/tests/e2e-targetallocator/targetallocator-prometheuscr/00-assert.yaml b/tests/e2e-targetallocator/targetallocator-prometheuscr/00-assert.yaml index c3e3cc1f28..81d40045f2 100644 --- a/tests/e2e-targetallocator/targetallocator-prometheuscr/00-assert.yaml +++ b/tests/e2e-targetallocator/targetallocator-prometheuscr/00-assert.yaml @@ -30,12 +30,12 @@ data: prometheus: config: global: - scrape_interval: 30s scrape_protocols: - PrometheusProto - OpenMetricsText1.0.0 - OpenMetricsText0.0.1 - PrometheusText0.0.4 + scrape_timeout: 1s target_allocator: collector_id: ${POD_NAME} endpoint: http://prometheus-cr-targetallocator:80 @@ -49,4 +49,4 @@ data: - prometheus kind: ConfigMap metadata: - name: prometheus-cr-collector-837a5cfe + name: prometheus-cr-collector-21f47755 diff --git a/tests/e2e-targetallocator/targetallocator-prometheuscr/01-install.yaml b/tests/e2e-targetallocator/targetallocator-prometheuscr/01-install.yaml index 42d7b0daaa..f327081812 100644 --- a/tests/e2e-targetallocator/targetallocator-prometheuscr/01-install.yaml +++ b/tests/e2e-targetallocator/targetallocator-prometheuscr/01-install.yaml @@ -46,8 +46,9 @@ spec: - /bin/sh - -c - > - curl -s http://prometheus-cr-targetallocator/scrape_configs | - grep "prometheus-cr" && grep "PrometheusProto" + curl -s http://prometheus-cr-targetallocator/scrape_configs > /tmp/output.txt && + grep "prometheus-cr" /tmp/output.txt && + grep "PrometheusProto" /tmp/output.txt --- apiVersion: batch/v1 kind: Job