Merge "Refactor OC4 cluster for K8s"