covidnetes/woodpecker-autoscaler
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 3 Wiki Activity

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

Browse Source
This commit is contained in:
Tobias Trabelsi 2023-11-08 21:10:47 +01:00
parent 98ec02ea0b
commit 9f90962d92
Signed by: lerentis
GPG Key ID: FF0C2839718CAF2E
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/config/config.go
View File

@ -17,6 +17,7 @@ type Config = struct {
WoodpeckerGrpc string `default:"" env:"WOODPECKER_AUTOSCALER_WOODPECKER_GRPC"` WoodpeckerGrpc string `default:"" env:"WOODPECKER_AUTOSCALER_WOODPECKER_GRPC"`
WoodpeckerAgentSecret string `default:"" env:"WOODPECKER_AUTOSCALER_WOODPECKER_AGENT_SECRET"` WoodpeckerAgentSecret string `default:"" env:"WOODPECKER_AUTOSCALER_WOODPECKER_AGENT_SECRET"`
WoodpeckerApiToken string `default:"" env:"WOODPECKER_AUTOSCALER_WOODPECKER_API_TOKEN"` WoodpeckerApiToken string `default:"" env:"WOODPECKER_AUTOSCALER_WOODPECKER_API_TOKEN"`
WoodpeckerAgentVersion string `default:"latest" env:"WOODPECKER_AUTOSCALER_WOODPECKER_AGENT_VERSION"`
HcloudToken string `default:"" env:"WOODPECKER_AUTOSCALER_HCLOUD_TOKEN"` HcloudToken string `default:"" env:"WOODPECKER_AUTOSCALER_HCLOUD_TOKEN"`
HcloudInstanceType string `default:"cpx21" env:"WOODPECKER_AUTOSCALER_HCLOUD_INSTANCE_TYPE"` HcloudInstanceType string `default:"cpx21" env:"WOODPECKER_AUTOSCALER_HCLOUD_INSTANCE_TYPE"`
HcloudRegion string `default:"" env:"WOODPECKER_AUTOSCALER_HCLOUD_REGION"` HcloudRegion string `default:"" env:"WOODPECKER_AUTOSCALER_HCLOUD_REGION"`

6
internal/hetzner/hetzneragent.go
View File

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

5
internal/hetzner/hetzneragent_test.go
View File

@ -16,6 +16,7 @@ func TestGenerateUserData(t *testing.T) {
WoodpeckerGrpc: "grpc-test.woodpecker.test.tld:443", WoodpeckerGrpc: "grpc-test.woodpecker.test.tld:443",
WoodpeckerAgentSecret: "Geheim1!", WoodpeckerAgentSecret: "Geheim1!",
WoodpeckerApiToken: "VeryGeheim1!", WoodpeckerApiToken: "VeryGeheim1!",
WoodpeckerAgentVersion: "latest",
HcloudToken: "EvenMoreGeheim1!", HcloudToken: "EvenMoreGeheim1!",
HcloudInstanceType: "cpx21", HcloudInstanceType: "cpx21",
HcloudRegion: "eu-central", HcloudRegion: "eu-central",
@ -37,9 +38,9 @@ write_files:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
environment: environment:
- WOODPECKER_AGENT_SECRET=Geheim1! - WOODPECKER_AGENT_SECRET=Geheim1!
- WOODPECKER_FILTER_LABELS="uploadfilter24.eu/instance-role=WoodpeckerTest" - WOODPECKER_FILTER_LABELS=uploadfilter24.eu/instance-role=WoodpeckerTest
- WOODPECKER_GRPC_SECURE=true - WOODPECKER_GRPC_SECURE=true
- WOODPECKER_HOSTNAME="test-instance" - WOODPECKER_HOSTNAME=test-instance
- WOODPECKER_SERVER=grpc-test.woodpecker.test.tld:443 - WOODPECKER_SERVER=grpc-test.woodpecker.test.tld:443
path: /root/docker-compose.yml path: /root/docker-compose.yml
runcmd: runcmd: