updates

Author: brudnak

automation/render-tool-config/main.go

@@ -180,6 +180,7 @@ func (cfg renderConfig) validate(lane signoffLane) error {
 }
 
 func renderToolConfig(cfg renderConfig, lane signoffLane) string {
+	rancherDistro := rancherDistroForLane(cfg.RancherDistro, lane)
 	return fmt.Sprintf(`rancher:
   mode: auto
   version: %s
@@ -211,7 +212,7 @@ tf_vars:
   aws_route53_fqdn: %s
 `,
 		yamlQuote(strings.TrimPrefix(lane.InstallRancher, "v")),
-		yamlQuote(cfg.RancherDistro),
+		yamlQuote(rancherDistro),
 		yamlQuote(cfg.BootstrapPassword),
 		cfg.AutoApprove,
 		cfg.PreloadImages,
@@ -232,6 +233,17 @@ tf_vars:
 	)
 }
 
+func rancherDistroForLane(configured string, lane signoffLane) string {
+	configured = strings.TrimSpace(configured)
+	if strings.EqualFold(configured, "auto") && strings.TrimSpace(lane.UpgradeToRancher) != "" {
+		// Keep the upgrade on one distribution. Otherwise auto mode installs the
+		// released baseline from Prime but resolves prerelease targets from the
+		// community repos, carrying Prime's system registry into the RC webhook.
+		return "community"
+	}
+	return configured
+}
+
 func renderEnvOutput(plan signoffPlan, lane signoffLane) (string, error) {
 	var b strings.Builder
 	if err := writeGitHubEnvLine(&b, "TF_STATE_KEY", lane.TerraformStateKey); err != nil {

automation/render-tool-config/main_test.go

@@ -45,6 +45,28 @@ func TestRenderToolConfigForFreshLane(t *testing.T) {
 	assertContains(t, rendered, `total_has: 1`)
 }
 
+func TestRenderToolConfigKeepsAutoUpgradeLaneOnCommunityDistro(t *testing.T) {
+	cfg := renderConfig{
+		RancherDistro: "auto",
+	}
+	lane := signoffLane{
+		Name:             "webhook-upgrade",
+		InstallRancher:   "v2.14.3",
+		UpgradeToRancher: "v2.15.0-rc2",
+	}
+
+	rendered := renderToolConfig(cfg, lane)
+	assertContains(t, rendered, `version: "2.14.3"`)
+	assertContains(t, rendered, `distro: "community"`)
+}
+
+func TestRancherDistroForLanePreservesExplicitSelection(t *testing.T) {
+	lane := signoffLane{UpgradeToRancher: "v2.15.0-rc2"}
+	if got := rancherDistroForLane("prime", lane); got != "prime" {
+		t.Fatalf("explicit distro changed to %q", got)
+	}
+}
+
 func TestRendererWritesConfigAndEnvOutput(t *testing.T) {
 	tempDir := t.TempDir()
 	planPath := filepath.Join(tempDir, "plan.json")