Skip to content
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.

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

fix(cloud): Correctly propagate --restart flag to deploy + create #1560

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions internal/cli/kraft/cloud/deploy/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"kraftkit.sh/unikraft/app"

kraftcloud "sdk.kraft.cloud"
kcinstances "sdk.kraft.cloud/instances"
)

type DeployOptions struct {
Expand Down Expand Up @@ -55,6 +56,7 @@ type DeployOptions struct {
Ports []string `local:"true" long:"port" short:"p" usage:"Specify the port mapping between external to internal"`
Project app.Application `noattribute:"true"`
Replicas int `local:"true" long:"replicas" short:"R" usage:"Number of replicas of the instance" default:"0"`
RestartPolicy kcinstances.RestartPolicy `noattribute:"true"`
Rollout create.RolloutStrategy `noattribute:"true"`
RolloutQualifier create.RolloutQualifier `noattribute:"true"`
RolloutWait time.Duration `local:"true" long:"rollout-wait" usage:"Time to wait before performing rolling out action" default:"10s"`
Expand Down Expand Up @@ -93,6 +95,15 @@ func NewCmd() *cobra.Command {
panic(err)
}

cmd.Flags().Var(
cmdfactory.NewEnumFlag[kcinstances.RestartPolicy](
kcinstances.RestartPolicies(),
kcinstances.RestartPolicyNever,
),
"restart",
"Set the restart policy for the instance (never/always/on-failure)",
)

cmd.Flags().Var(
cmdfactory.NewEnumFlag[create.RolloutStrategy](
append(create.RolloutStrategies(), create.StrategyPrompt),
Expand Down Expand Up @@ -129,6 +140,7 @@ func (opts *DeployOptions) Pre(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("could not populate metro and token: %w", err)
}

opts.RestartPolicy = kcinstances.RestartPolicy(cmd.Flag("restart").Value.String())
opts.Rollout = create.RolloutStrategy(cmd.Flag("rollout").Value.String())
opts.RolloutQualifier = create.RolloutQualifier(cmd.Flag("rollout-qualifier").Value.String())
opts.Strategy = packmanager.MergeStrategy(cmd.Flag("strategy").Value.String())
Expand Down
1 change: 1 addition & 0 deletions internal/cli/kraft/cloud/deploy/deployer_image_name.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ func (deployer *deployerImageName) Deploy(ctx context.Context, opts *DeployOptio
Name: opts.Name,
Ports: opts.Ports,
Replicas: opts.Replicas,
RestartPolicy: opts.RestartPolicy,
ScaleToZero: opts.ScaleToZero,
ServiceGroupNameOrUUID: opts.ServiceGroupNameOrUUID,
Rollout: opts.Rollout,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ func (deployer *deployerKraftfileRuntime) Deploy(ctx context.Context, opts *Depl
Name: opts.Name,
Ports: opts.Ports,
Replicas: opts.Replicas,
RestartPolicy: opts.RestartPolicy,
Rollout: opts.Rollout,
RolloutQualifier: opts.RolloutQualifier,
RolloutWait: opts.RolloutWait,
Expand Down
1 change: 1 addition & 0 deletions internal/cli/kraft/cloud/instance/create/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,7 @@ func (opts *CreateOptions) Pre(cmd *cobra.Command, _ []string) error {
return fmt.Errorf("could not populate metro and token: %w", err)
}

opts.RestartPolicy = kcinstances.RestartPolicy(cmd.Flag("restart").Value.String())
opts.Rollout = RolloutStrategy(cmd.Flag("rollout").Value.String())
opts.RolloutQualifier = RolloutQualifier(cmd.Flag("rollout-qualifier").Value.String())

Expand Down
Loading