fix: pass KOPS_BASE_URL to kops-controller

justinsb · justinsb · commit d9d4330964ef · 2025-10-24T11:56:37.000-04:00
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -908,6 +908,11 @@ func (tf *TemplateFunctions) KopsControllerEnv() []corev1.EnvVar {
 		envMap["KOPS_RUN_TOO_NEW_VERSION"] = v
 	}
 
+	// If our assets are served from a custom base URL, we need to pass that to kops-controller for cluster-api etc.
+	if v := os.Getenv("KOPS_BASE_URL"); v != "" {
+		envMap["KOPS_BASE_URL"] = v
+	}
+
 	return envMap.ToEnvVars()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -908,6 +908,11 @@ func (tf *TemplateFunctions) KopsControllerEnv() []corev1.EnvVar {`
`908`	`908`	`envMap["KOPS_RUN_TOO_NEW_VERSION"] = v`
`909`	`909`	`}`
`910`	`910`
	`911`	`+ // If our assets are served from a custom base URL, we need to pass that to kops-controller for cluster-api etc.`
	`912`	`+ if v := os.Getenv("KOPS_BASE_URL"); v != "" {`
	`913`	`+ envMap["KOPS_BASE_URL"] = v`
	`914`	`+ }`
	`915`	`+`
`911`	`916`	`return envMap.ToEnvVars()`
`912`	`917`	`}`
`913`	`918`