made version configurable as well and remove "" from agent config
All checks were successful
Pipeline was successful

This commit is contained in:
2023-11-08 21:10:47 +01:00
parent 98ec02ea0b
commit 9f90962d92
3 changed files with 7 additions and 5 deletions

View File

@@ -47,11 +47,11 @@ func generateConfig(cfg *config.Config, name string) (string, error) {
"WOODPECKER_SERVER": fmt.Sprintf("%s", cfg.WoodpeckerGrpc),
"WOODPECKER_GRPC_SECURE": true,
"WOODPECKER_AGENT_SECRET": fmt.Sprintf("%s", cfg.WoodpeckerAgentSecret),
"WOODPECKER_FILTER_LABELS": fmt.Sprintf(`"%s"`, cfg.WoodpeckerLabelSelector),
"WOODPECKER_HOSTNAME": fmt.Sprintf(`"%s"`, name),
"WOODPECKER_FILTER_LABELS": fmt.Sprintf("%s", cfg.WoodpeckerLabelSelector),
"WOODPECKER_HOSTNAME": fmt.Sprintf("%s", name),
}
config := UserDataConfig{
Image: "woodpeckerci/woodpecker-agent:latest",
Image: fmt.Sprintf("woodpeckerci/woodpecker-agent:%s", cfg.WoodpeckerAgentVersion),
EnvConfig: envConfig,
}
tmpl, err := template.New("userdata").Parse(USER_DATA_TEMPLATE)