promtorture: work around kapp label bug

work around carvel-dev/kapp#381
where kapp adds unwanted labels that break the kube-prometheus
service selctor

Author: ringerc

testcases/promtorture/README.md

@@ -61,6 +61,8 @@ go build
 
 ### Use `k8s-insider` to talk to the services
 
+(No OSX support at time of writing)
+
 See https://github.com/TrueGoric/k8s-insider
 
 Assuming Ubuntu 24.04:
@@ -75,6 +77,15 @@ resolvectl domain insider0 cluster.local
 
 This will give you the ability to directly query kube services like `prometheus-k8s.monitoring.svc.cluster.local` or visit http://grafana.monitoring.svc.cluster.local:3000 directly in a browser.
 
+### Use `socks5` to talk to the services
+
+```
+./scripts/socks5
+```
+
+Then set your `http_proxy` to `socks5://localhost:1081` and you can use `curl`
+etc to talk to the services.
+
 ### Grafana dashboard
 
 See [`resources`](./resources/grafana-dashboards/promtorture.json).

testcases/promtorture/scripts/kind-create.sh

@@ -19,6 +19,12 @@ if [ -f .cache/kube-prometheus/kustomization.yaml ]; then
 fi
 (cd .cache/kube-prometheus && kustomize create && kustomize edit add resource kube-prometheus.yaml)
 
-kustomize build kubernetes/kube-prometheus | kapp deploy -a kube-prometheus -f - -y
+# Deploy it, and stop kapp adding its app labels to work around
+# https://github.com/carvel-dev/kapp/issues/381
+kustomize build kubernetes/kube-prometheus \
+  | kapp deploy -a kube-prometheus -y \
+      --default-label-scoping-rules=false \
+      --apply-default-update-strategy=fallback-on-replace \
+      -f -
 
 # vim: et ts=2 sw=2 sts=2 ft=bash ai

testcases/promtorture/scripts/kind-deploy.sh

@@ -53,7 +53,10 @@ spec:
 __END__
 
 kustomize build "${tmpdir}" \
-  | kapp deploy -a promtorture -f - -y --diff-changes
+  | kapp deploy -a promtorture -f - -y \
+      --default-label-scoping-rules=false \
+      --apply-default-update-strategy=fallback-on-replace \
+      --diff-changes
 
 echo 1>&2 "Promtorture is running on service 'promtorture' on port 'metrics' (TCP/8080)"
 

testcases/promtorture/scripts/promapi

@@ -42,7 +42,7 @@ function apiQuery() {
   local endpoint
   endpoint=$1
   shift
-  curl -sL "${@}" 'http://prometheus-k8s.monitoring.svc.cluster.local:9090/'"${endpoint}"  | yq --prettyPrint .
+  curl -sSLf "${@}" 'http://prometheus-k8s.monitoring.svc.cluster.local:9090/'"${endpoint}"  | yq --prettyPrint .
 }
 
 case "${meta}" in

testcases/promtorture/scripts/socks5

@@ -5,5 +5,7 @@ set -e -u -o pipefail -x
 source scripts/config
 
 echo "use \"curl --socks5-hostname localhost:1081\" to make requests"
+echo "or set:"
+echo "    http_proxy=socks5://localhost:1081 https_proxy=socks5://localhost:1081"
 
 exec kubectl socks5-proxy -p 1081