Merge "Split infra and workload monitoring for K8S"