From 7f2c465391f9e53526094389c47c6edbe3ccd00f Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Tue, 31 Oct 2023 23:18:08 +0100 Subject: [PATCH] implemented spawning of new agents split pipeline --- .woodpecker.yml | 65 ----------------------------- .woodpecker/main.yml | 29 +++++++++++++ .woodpecker/pr.yml | 25 ++++++++++++ .woodpecker/release.yml | 28 +++++++++++++ cmd/woodpecker-autoscaler.go | 49 +++++++++++++++++++++- go.mod | 18 +++++++- go.sum | 56 ++++++++++++++++++++++--- internal/config/config.go | 3 +- internal/hetzner/hetzneragent.go | 70 +++++++++++++++++++++++++++++++- internal/models/structs.go | 36 ++++++++++++++++ internal/utils/utils.go | 17 ++++++++ internal/woodpecker/agent.go | 60 +++++++++++++++++++++++++++ internal/woodpecker/metrics.go | 47 ++++++++++++++------- 13 files changed, 412 insertions(+), 91 deletions(-) delete mode 100644 .woodpecker.yml create mode 100644 .woodpecker/main.yml create mode 100644 .woodpecker/pr.yml create mode 100644 .woodpecker/release.yml create mode 100644 internal/utils/utils.go create mode 100644 internal/woodpecker/agent.go diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 8910fea..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,65 +0,0 @@ -steps: - test: - image: golang:1.21 - commands: - - go test ./... - when: - - event: pull_request - - event: push - branch: main - - event: tag - pr-build: - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/arm64/v8 - repo: lerentis/metallb-ip-floater - tags: - - latest - - ${CI_COMMIT_SHA} - dry-run: true - when: - - event: pull_request - pre-release: - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/arm64/v8 - repo: lerentis/metallb-ip-floater - tags: - - latest - - ${CI_COMMIT_SHA} - password: - from_secret: docker_hub_password - username: - from_secret: docker_hub_username - when: - - event: push - branch: main - release: - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/arm64/v8 - repo: lerentis/metallb-ip-floater - tags: - - latest - - ${CI_COMMIT_TAG} - password: - from_secret: docker_hub_password - username: - from_secret: docker_hub_username - when: - - event: tag - notify: - image: appleboy/drone-telegram - settings: - message: "Commit {{ commit.message }} ({{ commit.link }}) ran with build {{ build.number }} and finished with status {{ build.status }}." - to: - from_secret: telegram_userid - token: - from_secret: telegram_secret - when: - - event: pull_request - - event: push - branch: main - - event: tag - - status: success - - status: failure diff --git a/.woodpecker/main.yml b/.woodpecker/main.yml new file mode 100644 index 0000000..804c829 --- /dev/null +++ b/.woodpecker/main.yml @@ -0,0 +1,29 @@ +when: + - event: push + branch: main + +steps: + test: + image: golang:1.21 + commands: + - go test ./... + pre-release: + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/arm64/v8 + repo: lerentis/metallb-ip-floater + tags: + - latest + - ${CI_COMMIT_SHA} + password: + from_secret: docker_hub_password + username: + from_secret: docker_hub_username + notify: + image: appleboy/drone-telegram + settings: + message: "Commit {{ commit.message }} ({{ commit.link }}) ran with build {{ build.number }} and finished with status {{ build.status }}." + to: + from_secret: telegram_userid + token: + from_secret: telegram_secret diff --git a/.woodpecker/pr.yml b/.woodpecker/pr.yml new file mode 100644 index 0000000..7fbdc8a --- /dev/null +++ b/.woodpecker/pr.yml @@ -0,0 +1,25 @@ +when: + - event: pull_request + +steps: + test: + image: golang:1.21 + commands: + - go test ./... + pr-build: + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/arm64/v8 + repo: lerentis/metallb-ip-floater + tags: + - latest + - ${CI_COMMIT_SHA} + dry-run: true + notify: + image: appleboy/drone-telegram + settings: + message: "Commit {{ commit.message }} ({{ commit.link }}) ran with build {{ build.number }} and finished with status {{ build.status }}." + to: + from_secret: telegram_userid + token: + from_secret: telegram_secret diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml new file mode 100644 index 0000000..c3e6998 --- /dev/null +++ b/.woodpecker/release.yml @@ -0,0 +1,28 @@ +when: + - event: tag + +steps: + test: + image: golang:1.21 + commands: + - go test ./... + release: + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/arm64/v8 + repo: lerentis/metallb-ip-floater + tags: + - latest + - ${CI_COMMIT_TAG} + password: + from_secret: docker_hub_password + username: + from_secret: docker_hub_username + notify: + image: appleboy/drone-telegram + settings: + message: "Commit {{ commit.message }} ({{ commit.link }}) ran with build {{ build.number }} and finished with status {{ build.status }}." + to: + from_secret: telegram_userid + token: + from_secret: telegram_secret diff --git a/cmd/woodpecker-autoscaler.go b/cmd/woodpecker-autoscaler.go index d528995..fc89d70 100644 --- a/cmd/woodpecker-autoscaler.go +++ b/cmd/woodpecker-autoscaler.go @@ -6,8 +6,10 @@ import ( "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/config" "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/health" + "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/hetzner" "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/logging" "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/woodpecker" + "github.com/hetznercloud/hcloud-go/hcloud" log "github.com/sirupsen/logrus" ) @@ -34,7 +36,52 @@ func main() { }).Info("Entering main event loop") for { - woodpecker.CheckPending(cfg) + pendingTasks, err := woodpecker.CheckPending(cfg) + if err != nil { + log.WithFields(log.Fields{ + "Caller": "Main", + }).Fatal(fmt.Sprintf("Error checking woodpecker queue: %s", err.Error())) + } + if pendingTasks { + server, err := hetzner.CreateNewAgent(cfg) + if err != nil { + log.WithFields(log.Fields{ + "Caller": "Main", + }).Fatal(fmt.Sprintf("Error spawning new agent: %s", err.Error())) + } + for { + if server.Status == hcloud.ServerStatusRunning { + log.WithFields(log.Fields{ + "Caller": "Main", + }).Infof("%s started!", server.Name) + break + } + log.WithFields(log.Fields{ + "Caller": "Main", + }).Infof("Waiting for agent %s to start", server.Name) + } + } else { + log.WithFields(log.Fields{ + "Caller": "Main", + }).Info("Checking if agents can be removed") + runningTasks, err := woodpecker.CheckRunning(cfg) + if err != nil { + log.WithFields(log.Fields{ + "Caller": "Main", + }).Fatal(fmt.Sprintf("Error checking woodpecker queue: %s", err.Error())) + } + if runningTasks { + log.WithFields(log.Fields{ + "Caller": "Main", + }).Info("Still found running tasks. No agent to be removed") + } else { + log.WithFields(log.Fields{ + "Caller": "Main", + }).Info("No tasks running. Will remove agents") + // TODO: iterate over agents and remove ours + // agent name should match hetzner name + } + } time.Sleep(time.Duration(cfg.CheckInterval) * time.Minute) } } diff --git a/go.mod b/go.mod index 4aa429d..01119a7 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,26 @@ go 1.21.1 require ( github.com/gorilla/mux v1.8.0 + github.com/hetznercloud/hcloud-go v1.52.0 github.com/jinzhu/configor v1.2.1 github.com/sirupsen/logrus v1.9.3 ) require ( github.com/BurntSushi/toml v0.3.1 // indirect - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect - gopkg.in/yaml.v2 v2.2.2 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/prometheus/client_golang v1.16.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 05c5af2..f9ca42b 100644 --- a/go.sum +++ b/go.sum @@ -1,24 +1,70 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/hetznercloud/hcloud-go v1.52.0 h1:3r9pEulTOBB9BoArSgpQYUQVTy+Xjkg0k/QAU4c6dQ8= +github.com/hetznercloud/hcloud-go v1.52.0/go.mod h1:VzDWThl47lOnZXY0q5/LPFD+M62pfe/52TV+mOrpp9Q= github.com/jinzhu/configor v1.2.1 h1:OKk9dsR8i6HPOCZR8BcMtcEImAFjIhbJFZNyn5GCZko= github.com/jinzhu/configor v1.2.1/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/config/config.go b/internal/config/config.go index 7d59d32..7661b75 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -18,7 +18,8 @@ type Config = struct { Protocol string `default:"http" env:"WOODPECKER_AUTOSCALER_PROTOCOL"` HcloudToken string `default:"" env:"WOODPECKER_AUTOSCALER_HCLOUD_TOKEN"` InstanceType string `default:"" env:"WOODPECKER_AUTOSCALER_INSTANCE_TYPE"` - Zone string `default:"" env:"WOODPECKER_AUTOSCALER_ZONE"` + Region string `default:"" env:"WOODPECKER_AUTOSCALER_REGION"` + Datacenter string `default:"" env:"WOODPECKER_AUTOSCALER_DATACENTER"` DryRun bool `default:"false" env:"WOODPECKER_AUTOSCALER_DRY_RUN"` SSHKey string `default:"" env:"WOODPECKER_AUTOSCALER_SSH_KEY"` } diff --git a/internal/hetzner/hetzneragent.go b/internal/hetzner/hetzneragent.go index 142a00f..ded5b3a 100644 --- a/internal/hetzner/hetzneragent.go +++ b/internal/hetzner/hetzneragent.go @@ -2,11 +2,16 @@ package hetzner import ( "bytes" + "context" "errors" "fmt" "text/template" "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/config" + "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/utils" + "github.com/hetznercloud/hcloud-go/hcloud" + + log "github.com/sirupsen/logrus" ) var USER_DATA_TEMPLATE = ` @@ -37,11 +42,12 @@ type UserDataConfig struct { EnvConfig map[string]string } -func generateConfig(cfg *config.Config) (string, error) { +func generateConfig(cfg *config.Config, name string) (string, error) { envConfig := map[string]string{} envConfig["WOODPECKER_SERVER"] = cfg.WoodpeckerInstance envConfig["WOODPECKER_AGENT_SECRET"] = cfg.WoodpeckerAgentSecret envConfig["WOODPECKER_FILTER_LABELS"] = cfg.LabelSelector + envConfig["WOODPECKER_HOSTNAME"] = name config := UserDataConfig{ Image: "woodpeckerci/woodpecker-agent:latest", EnvConfig: envConfig, @@ -55,6 +61,66 @@ func generateConfig(cfg *config.Config) (string, error) { if err != nil { return "", errors.New(fmt.Sprintf("Could not render userdata template: %s", err.Error())) } - return buf.String(), nil } + +func CreateNewAgent(cfg *config.Config) (*hcloud.Server, error) { + client := hcloud.NewClient(hcloud.WithToken(cfg.HcloudToken)) + name := fmt.Sprintf("woodpecker-autoscaler-agent-%s", utils.RandStringBytes(5)) + userdata, err := generateConfig(cfg, name) + img, _, err := client.Image.GetByNameAndArchitecture(context.Background(), "docker", "amd64") + loc, _, err := client.Location.GetByName(context.Background(), cfg.Region) + pln, _, err := client.ServerType.GetByName(context.Background(), cfg.InstanceType) + key, _, err := client.SSHKey.GetByName(context.Background(), cfg.SSHKey) + dc, _, err := client.Datacenter.GetByName(context.Background(), cfg.Datacenter) + labels := map[string]string{} + labels["Role"] = "WoodpeckerAgent" + labels["ControledBy"] = "WoodpeckerAutoscaler" + + if err != nil { + return nil, errors.New(fmt.Sprintf("Could not create new Agent: %s", err.Error())) + } + + res, _, err := client.Server.Create(context.Background(), hcloud.ServerCreateOpts{ + Name: name, + ServerType: pln, + Image: img, + SSHKeys: []*hcloud.SSHKey{key}, + Location: loc, + Datacenter: dc, + UserData: userdata, + StartAfterCreate: utils.BoolPointer(true), + Labels: labels, + }) + + log.WithFields(log.Fields{ + "Caller": "CreateNewAgent", + }).Infof("Created new Build Agent %s", res.Server.Name) + + return res.Server, nil +} + +func ListAgents(cfg *config.Config) ([]hcloud.Server, error) { + client := hcloud.NewClient(hcloud.WithToken(cfg.HcloudToken)) + allServers, err := client.Server.All(context.Background()) + if err != nil { + return nil, errors.New(fmt.Sprintf("Could not query Server list: %s", err.Error())) + } + myServers := []hcloud.Server{} + for _, server := range allServers { + val, exists := server.Labels["ControledBy"] + if exists && val == "WoodpeckerAutoscaler" { + myServers = append(myServers, *server) + } + } + return myServers, nil +} + +func DecomAgent(cfg *config.Config, server *hcloud.Server) error { + client := hcloud.NewClient(hcloud.WithToken(cfg.HcloudToken)) + _, _, err := client.Server.DeleteWithResult(context.Background(), server) + if err != nil { + return errors.New(fmt.Sprintf("Could not delete Agent: %s", err.Error())) + } + return nil +} diff --git a/internal/models/structs.go b/internal/models/structs.go index 9512d05..ab85bc3 100644 --- a/internal/models/structs.go +++ b/internal/models/structs.go @@ -54,3 +54,39 @@ type QueueInfo struct { Stats Stats `json:"stats"` Paused bool `json:"paused"` } + +/*[ + { + "id": 2, + "created": 1693567407, + "updated": 1694013270, + "name": "", + "owner_id": -1, + "token": "redacted", + "last_contact": 1694013270, + "platform": "linux/arm64", + "backend": "kubernetes", + "capacity": 4, + "version": "next-971534929c", + "no_schedule": false + } +]*/ + +type Agent struct { + ID int64 `json:"id"` + Created int64 `json:"created"` + Updated int64 `json:"updated"` + Name string `json:"name"` + OwnerID int64 `json:"owner_id"` + Token string `json:"token"` + LastContact int64 `json:"last_contact"` + Platform string `json:"platform"` + Backend string `json:"backend"` + Capacity int32 `json:"capacity"` + Version string `json:"version"` + NoSchedule bool `json:"no_schedule"` +} + +type AgentList struct { + Agents []Agent +} diff --git a/internal/utils/utils.go b/internal/utils/utils.go new file mode 100644 index 0000000..b2103f4 --- /dev/null +++ b/internal/utils/utils.go @@ -0,0 +1,17 @@ +package utils + +import "math/rand" + +const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" + +func RandStringBytes(n int) string { + b := make([]byte, n) + for i := range b { + b[i] = letterBytes[rand.Intn(len(letterBytes))] + } + return string(b) +} + +func BoolPointer(b bool) *bool { + return &b +} diff --git a/internal/woodpecker/agent.go b/internal/woodpecker/agent.go new file mode 100644 index 0000000..c9d61e2 --- /dev/null +++ b/internal/woodpecker/agent.go @@ -0,0 +1,60 @@ +package woodpecker + +import ( + "encoding/json" + "errors" + "fmt" + "net/http" + + "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/config" + "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/models" +) + +func DecomAgent(cfg *config.Config, agentId int) error { + apiRoute := fmt.Sprintf("%s/api/agents/%d", cfg.WoodpeckerInstance, agentId) + req, err := http.NewRequest("DELETE", apiRoute, nil) + if err != nil { + return errors.New(fmt.Sprintf("Could not create delete request: %s", err.Error())) + } + req.Header.Set("Accept", "text/plain") + req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", cfg.WoodpeckerApiToken)) + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return errors.New(fmt.Sprintf("Could not delete agent: %s", err.Error())) + } + defer resp.Body.Close() + return nil +} + +func GetAgentIdByName(cfg *config.Config, name string) (int, error) { + apiRoute := fmt.Sprintf("%s/api/agents?page=1&perPage=100", cfg.WoodpeckerInstance) + req, err := http.NewRequest("GET", apiRoute, nil) + if err != nil { + return 0, errors.New(fmt.Sprintf("Could not create agent query request: %s", err.Error())) + } + req.Header.Set("Accept", "application/json") + req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", cfg.WoodpeckerApiToken)) + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return 0, errors.New(fmt.Sprintf("Could not query agent list: %s", err.Error())) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return 0, errors.New(fmt.Sprintf("Invalid status code from API: %d", resp.StatusCode)) + } + agentList := new(models.AgentList) + err = json.NewDecoder(resp.Body).Decode(agentList) + if err != nil { + return 0, errors.New(fmt.Sprintf("Could not unmarshal api response: %s", err.Error())) + } + + for _, agent := range agentList.Agents { + if agent.Name == name { + return int(agent.ID), nil + } + } + return 0, errors.New(fmt.Sprintf("Agent with name %s is not in server", name)) +} diff --git a/internal/woodpecker/metrics.go b/internal/woodpecker/metrics.go index a48517d..96f2759 100644 --- a/internal/woodpecker/metrics.go +++ b/internal/woodpecker/metrics.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/http" + "strings" "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/config" "git.uploadfilter24.eu/covidnetes/woodpecker-autoscaler/internal/models" @@ -34,27 +35,43 @@ func QueueInfo(cfg *config.Config, target interface{}) error { return json.NewDecoder(resp.Body).Decode(target) } -func CheckPending(cfg *config.Config) error { +func CheckPending(cfg *config.Config) (bool, error) { + expectedKV := strings.Split(cfg.LabelSelector, "=") queueInfo := new(models.QueueInfo) err := QueueInfo(cfg, queueInfo) if err != nil { - return errors.New(fmt.Sprintf("Error from QueueInfo: %s", err.Error())) + return false, errors.New(fmt.Sprintf("Error from QueueInfo: %s", err.Error())) } if queueInfo.Stats.PendingCount > 0 { - // TODO: queueInfo.Pending may be empty - for _, pendingJobs := range queueInfo.Pending { - // TODO: separate key and value from LabelSelector and compare them deeply - _, exists := pendingJobs.Labels[cfg.LabelSelector] - if exists { - log.WithFields(log.Fields{ - "Caller": "CheckPending", - }).Info("Found pending job for us. Requesting new Agent") - } else { - log.WithFields(log.Fields{ - "Caller": "CheckPending", - }).Info("No Jobs for us in Queue") + if queueInfo.Pending != nil { + for _, pendingJobs := range queueInfo.Pending { + val, exists := pendingJobs.Labels[expectedKV[0]] + if exists && val == expectedKV[1] { + log.WithFields(log.Fields{ + "Caller": "CheckPending", + }).Info("Found pending job for us") + return true, nil + } else { + log.WithFields(log.Fields{ + "Caller": "CheckPending", + }).Info("No Jobs for us in Queue") + return false, nil + } } } } - return nil + return false, nil +} + +func CheckRunning(cfg *config.Config) (bool, error) { + queueInfo := new(models.QueueInfo) + err := QueueInfo(cfg, queueInfo) + if err != nil { + return false, errors.New(fmt.Sprintf("Error from QueueInfo: %s", err.Error())) + } + // TODO: create and parse running object. there may be jobs that are not for us + if queueInfo.Stats.RunningCount > 0 { + return true, nil + } + return false, nil }