Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b131ac8

Browse files
committedAug 15, 2024·
temporarily remove serviceMonitor manifest for coredns
1 parent d54095f commit b131ac8

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed
 

‎tests/tasks/generators/clusterloader/load-slos.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ spec:
141141
effect: NoSchedule
142142
EOF
143143
cat $(workspaces.source.path)/perf-tests/clusterloader2/pkg/prometheus/manifests/exporters/kube-state-metrics/deployment.yaml
144+
145+
# TODO: Remove this once we fix https://github.com/kubernetes/kubernetes/issues/126578 or find a better way to work around it.
146+
rm $(workspaces.source.path)/perf-tests/clusterloader2/pkg/prometheus/manifests/default/prometheus-serviceMonitorCoreDNS.yaml
147+
rm $(workspaces.source.path)/perf-tests/clusterloader2/pkg/prometheus/manifests/default/prometheus-serviceMonitorLegacyKubeDNS.yaml
148+
144149
fi
145150
# Building clusterloader2 binary
146151
cd $(workspaces.source.path)/perf-tests/clusterloader2/
@@ -162,10 +167,6 @@ spec:
162167
fi
163168
cat $(workspaces.source.path)/perf-tests/clusterloader2/testing/load/config.yaml
164169
cd $(workspaces.source.path)/perf-tests/clusterloader2/
165-
# [ToDo] To temporarily stop bleeding we delete these.
166-
# Related issue - https://github.com/kubernetes/kubernetes/issues/126578
167-
kubectl --kubeconfig=$KUBECONFIG delete servicemonitor kube-dns -n monitoring
168-
kubectl --kubeconfig=$KUBECONFIG delete servicemonitor coredns -n monitoring
169170
ENABLE_EXEC_SERVICE=false ./clusterloader --kubeconfig=$KUBECONFIG --testconfig=$(workspaces.source.path)/perf-tests/clusterloader2/testing/load/config.yaml --testoverrides=$(workspaces.source.path)/overrides.yaml --nodes=$(params.nodes) --provider=eks --report-dir=$(workspaces.results.path) --alsologtostderr --v=2
170171
exit_code=$?
171172
if [ $exit_code -eq 0 ]; then

0 commit comments

Comments
 (0)
Please sign in to comment.