[patch] Fix gitops functions to differentiate between similar named clusters

[whitfiea]

In gitops, if we have a cluster callled fvtsaas and another called fvtsaas2 then the functions can't find the correct cluster to determine the vpc as when it greps it just uses the clustername, and that will return both of these. The actual value we are looking for is the generated vpc name. Adding the - means we can find the vpc for fvtsaas rather than fvtsaas2