mirror of
https://github.com/cirruslabs/orchard.git
synced 2026-10-20 18:11:32 +02:00
Resources support (#63)
* Resources support * Ability to provide VM and worker resources via the CLI * orchard dev: always listen on :6120 * orchard dev: support --resources * REST API: provide resource defaults when creating VM * OpenAPI: document "resources" field * orchard dev: serve Swagger API documentation on /v1/ * Integration guide
This commit is contained in:
@@ -2,20 +2,25 @@ package worker
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/cirruslabs/orchard/internal/bootstraptoken"
|
||||
"github.com/cirruslabs/orchard/internal/netconstants"
|
||||
"github.com/cirruslabs/orchard/internal/worker"
|
||||
"github.com/cirruslabs/orchard/pkg/client"
|
||||
v1 "github.com/cirruslabs/orchard/pkg/resource/v1"
|
||||
"github.com/spf13/cobra"
|
||||
"go.uber.org/zap"
|
||||
"go.uber.org/zap/zapcore"
|
||||
"gopkg.in/natefinch/lumberjack.v2"
|
||||
)
|
||||
|
||||
var ErrRunFailed = errors.New("failed to run worker")
|
||||
|
||||
var ErrBootstrapTokenNotProvided = errors.New("no bootstrap token provided")
|
||||
|
||||
var bootstrapTokenRaw string
|
||||
var logFilePath string
|
||||
var stringToStringResources map[string]string
|
||||
|
||||
func newRunCommand() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
@@ -24,10 +29,14 @@ func newRunCommand() *cobra.Command {
|
||||
RunE: runWorker,
|
||||
Args: cobra.ExactArgs(1),
|
||||
}
|
||||
|
||||
cmd.PersistentFlags().StringVar(&bootstrapTokenRaw, "bootstrap-token", "",
|
||||
"a bootstrap token retrieved via `orchard get bootstrap-token <service-account-name-for-workers>`")
|
||||
cmd.PersistentFlags().StringVar(&logFilePath, "log-file", "",
|
||||
"optional path to a file where logs (up to 100 Mb) will be written.")
|
||||
cmd.PersistentFlags().StringToStringVar(&stringToStringResources, "resources", map[string]string{},
|
||||
"resources that this worker provides")
|
||||
|
||||
return cmd
|
||||
}
|
||||
|
||||
@@ -44,6 +53,12 @@ func runWorker(cmd *cobra.Command, args []string) (err error) {
|
||||
return err
|
||||
}
|
||||
|
||||
// Convert resources
|
||||
resources, err := v1.NewResourcesFromStringToString(stringToStringResources)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: %v", ErrRunFailed, err)
|
||||
}
|
||||
|
||||
controllerClient, err := client.New(
|
||||
client.WithAddress(controllerURL.String()),
|
||||
client.WithTrustedCertificate(bootstrapToken.Certificate()),
|
||||
@@ -65,7 +80,11 @@ func runWorker(cmd *cobra.Command, args []string) (err error) {
|
||||
}
|
||||
}()
|
||||
|
||||
workerInstance, err := worker.New(controllerClient, worker.WithLogger(logger))
|
||||
workerInstance, err := worker.New(
|
||||
controllerClient,
|
||||
worker.WithResources(resources),
|
||||
worker.WithLogger(logger),
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user