Or is it the other way, days of overcharging and being locked into a cloud provider are numbered since the software that runs the infrastructure is not the secret / proprietary anymore.
Small data point but the uptake of aws lambda has been crazy in spite of the clear lock-in. Similarly S3 and several other proprietary cloud services. The cost of infra software is nominal compared to what it takes to manage it and maintain high uptime.
The uptake of k8s has been way more prominent than lambda, and k8s is platform agnostic. That's the whole reason AWS dosen't offer it as a managed service.