Merge "[COMAC-96] Change k8s and tosca configs to use the latest XOS chart"