Skip to content

feat: handle base URL and fake SMD consistently #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rainest merged 1 commit into from
Oct 6, 2025
Merged

feat: handle base URL and fake SMD consistently #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions cmd/cloud-init-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ func setupFlags(flags *pflag.FlagSet) {
flags.StringVar(&region, "region", getEnv("REGION", ""), "Region of the cluster")
flags.StringVar(&availabilityZone, "az", getEnv("AZ", ""), "Availability zone of the cluster")
flags.StringVar(&cloudProvider, "cloud-provider", getEnv("CLOUD_PROVIDER", ""), "Cloud provider of the cluster")
flags.StringVar(&baseUrl, "base-url", getEnv("BASE_URL", ""), "Base URL for cloud-init-server including protocol and port (e.g. http://localhost:27777)")
flags.StringVar(&baseUrl, "base-url", getEnv("BASE_URL", "http://cloud-init:27777"), "Base URL for cloud-init-server including protocol and port (e.g. http://localhost:27777)")
flags.StringVar(&certPath, "cacert", getEnv("CACERT", ""), "Path to CA cert (defaults to system CAs)")
flags.BoolVar(&insecure, "insecure", parseBool(getEnv("INSECURE", "false")), "Set to bypass TLS verification for requests")
flags.BoolVar(&impersonationEnabled, "impersonation", parseBool(getEnv("IMPERSONATION", "false")), "Enable impersonation feature")
flags.BoolVar(&fakeSMDEnabled, "smd-simulator", parseBool(getEnv("CLOUD_INIT_SMD_SIMULATOR", "false")), "Enable fake SMD")
flags.StringVar(&wireguardServer, "wireguard-server", getEnv("WIREGUARD_SERVER", ""), "WireGuard server IP address and network (e.g. 100.97.0.1/16)")
flags.BoolVar(&wireguardOnly, "wireguard-only", parseBool(getEnv("WIREGUARD_ONLY", "false")), "Only allow access to the cloud-init functions from the WireGuard subnet")
flags.BoolVar(&debug, "debug", parseBool(getEnv("DEBUG", "false")), "Enable debug logging")
Expand Down Expand Up @@ -187,7 +188,7 @@ func startServer() error {

// Create SMD client
var sm smdclient.SMDClientInterface
if os.Getenv("CLOUD_INIT_SMD_SIMULATOR") == "true" {
if fakeSMDEnabled {
fmt.Printf("\n\n**********\n\n\tCLOUD_INIT_SMD_SIMULATOR is set to true in your environment.\n\n\tUsing the FakeSMDClient\n\n**********\n\n\n")
sm = smdclient.NewFakeSMDClient(clusterName, 500)
} else {
Expand Down Expand Up @@ -285,12 +286,12 @@ func initCiClientRouter(router chi.Router, handler *CiHandler, wgInterfaceManage
if wireGuardMiddleware != nil {
router.With(wireGuardMiddleware).Get("/user-data", UserDataHandler)
router.With(wireGuardMiddleware).Get("/meta-data", MetaDataHandler(handler.sm, handler.store))
router.With(wireGuardMiddleware).Get("/vendor-data", VendorDataHandler(handler.sm, handler.store))
router.With(wireGuardMiddleware).Get("/vendor-data", VendorDataHandler(handler.sm, handler.store, baseUrl))
router.With(wireGuardMiddleware).Get("/{group}.yaml", GroupUserDataHandler(handler.sm, handler.store))
} else {
router.Get("/user-data", UserDataHandler)
router.Get("/meta-data", MetaDataHandler(handler.sm, handler.store))
router.Get("/vendor-data", VendorDataHandler(handler.sm, handler.store))
router.Get("/vendor-data", VendorDataHandler(handler.sm, handler.store, baseUrl))
router.Get("/{group}.yaml", GroupUserDataHandler(handler.sm, handler.store))
}
router.Post("/phone-home/{id}", PhoneHomeHandler(wgInterfaceManager, handler.sm))
Expand Down Expand Up @@ -319,7 +320,7 @@ func initCiAdminRouter(router chi.Router, handler *CiHandler) {
// impersonation API endpoints
r.Get("/impersonation/{id}/user-data", UserDataHandler)
r.Get("/impersonation/{id}/meta-data", MetaDataHandler(handler.sm, handler.store))
r.Get("/impersonation/{id}/vendor-data", VendorDataHandler(handler.sm, handler.store))
r.Get("/impersonation/{id}/vendor-data", VendorDataHandler(handler.sm, handler.store, baseUrl))
r.Get("/impersonation/{id}/{group}.yaml", GroupUserDataHandler(handler.sm, handler.store))
}

Expand Down
6 changes: 1 addition & 5 deletions cmd/cloud-init-server/vendordata_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ import (
// @Param id path string false "Node ID"
// @Router /vendor-data [get]
// @Router /admin/impersonation/{id}/vendor-data [get]
func VendorDataHandler(smd smdclient.SMDClientInterface, store cistore.Store) http.HandlerFunc {
func VendorDataHandler(smd smdclient.SMDClientInterface, store cistore.Store, baseUrl string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
urlId := chi.URLParam(r, "id")
var baseUrl string
var id = urlId
var err error
// If this request includes an id, it can be interrpreted as an impersonation request
Expand Down Expand Up @@ -75,9 +74,6 @@ func VendorDataHandler(smd smdclient.SMDClientInterface, store cistore.Store) ht
if extendedInstanceData.CloudInitBaseURL != "" {
baseUrl = extendedInstanceData.CloudInitBaseURL
}
if baseUrl == "" {
baseUrl = "http://cloud-init:27777"
}

payload := "#include\n"
for _, group_name := range groups {
Expand Down