Skip to content

Commit 1f45a38

Browse files
authored
Merge branch 'main' into fix-chainsaw
2 parents 10b734b + 4a0713d commit 1f45a38

File tree

6 files changed

+11
-33
lines changed

6 files changed

+11
-33
lines changed

tests/e2e-targetallocator/targetallocator-kubernetessd/00-assert.yaml

+9-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ metadata:
1313
name: prometheus-kubernetessd-targetallocator
1414
---
1515
apiVersion: v1
16+
kind: ConfigMap
17+
metadata:
18+
name: prometheus-kubernetessd-collector
1619
data:
1720
collector.yaml: |
1821
exporters:
@@ -33,6 +36,11 @@ data:
3336
processors: []
3437
receivers:
3538
- prometheus
36-
kind: ConfigMap
39+
---
40+
apiVersion: apps/v1
41+
kind: DaemonSet
3742
metadata:
3843
name: prometheus-kubernetessd-collector
44+
status:
45+
numberMisscheduled: 0
46+
(desiredNumberScheduled == numberReady): true

tests/e2e-targetallocator/targetallocator-kubernetessd/chainsaw-test.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ spec:
1313
file: 00-install.yaml
1414
- assert:
1515
file: 00-assert.yaml
16-
- script:
17-
content: ./tests/e2e/smoke-daemonset/check-daemonset.sh
16+
catch:
1817
- podLogs:
1918
selector: app.kubernetes.io/managed-by=opentelemetry-operator
2019
- name: step-01

tests/e2e-targetallocator/targetallocator-kubernetessd/check-daemonset.sh

-15
This file was deleted.

tests/e2e/smoke-daemonset/00-assert.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ spec:
1010
type: RollingUpdate
1111
status:
1212
numberMisscheduled: 0
13+
(desiredNumberScheduled == numberReady): true

tests/e2e/smoke-daemonset/chainsaw-test.yaml

100755100644
File mode changed.

tests/e2e/smoke-daemonset/check-daemonset.sh

-15
This file was deleted.

0 commit comments

Comments
 (0)