Merge pull request #11824 from chrischdi/pr-fixup-clusterctl-overrides-fallback

🌱 clusterctl: fix fallback to overrides directory in home when there is no overrides directory in XDG directory

Author: k8s-ci-robot

cmd/clusterctl/client/repository/overrides.go

@@ -74,6 +74,13 @@ func (o *overrides) Path() (string, error) {
 		return "", err
 	}
 	basepath := filepath.Join(configDirectory, overrideFolder)
+	// Fallback to the .cluster-api directory in home if the above does not exist.
+	if _, err := os.Stat(basepath); os.IsNotExist(err) {
+		fallbackBasepath := filepath.Join(xdg.Home, config.ConfigFolder, overrideFolder)
+		if _, err := os.Stat(fallbackBasepath); err == nil {
+			basepath = fallbackBasepath
+		}
+	}
 	f, err := o.configVariablesClient.Get(overrideFolderKey)
 	if err == nil && strings.TrimSpace(f) != "" {
 		basepath = f