adjusting branch selection logic on gcp (#1731)

konstructio · Jul 31, 2023 · db1dfa0 · db1dfa0
1 parent b75aafe
commit db1dfa0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cmd/gcp/create.go b/cmd/gcp/create.go
@@ -395,14 +395,19 @@ func createGCP(cmd *cobra.Command, args []string) error {
 		if strings.Contains(gitopsTemplateURLFlag, "https://github.com/kubefirst/gitops-template.git") && gitopsTemplateBranchFlag == "" {
 			gitopsTemplateBranchFlag = "main"
 		}
-	case "default":
+	default:
 		switch gitopsTemplateURLFlag {
 		case "https://github.com/kubefirst/gitops-template.git":
 			if gitopsTemplateBranchFlag == "" {
 				gitopsTemplateBranchFlag = configs.K1Version
 			}
+		default:
+			if gitopsTemplateBranchFlag != "" {
+				return fmt.Errorf("must supply gitops-template-branch flag when gitops-template-url is overridden")
+			}
 		}
 	}
+
 	log.Info().Msgf("kubefirst version configs.K1Version: %s ", configs.K1Version)
 	log.Info().Msgf("cloning gitops-template repo url: %s ", gitopsTemplateURLFlag)
 	log.Info().Msgf("cloning gitops-template repo branch: %s ", gitopsTemplateBranchFlag)