From 9243718899865bc39ea79f68fc69f36c5ae9682d Mon Sep 17 00:00:00 2001 From: James Rasell Date: Thu, 19 Mar 2020 15:30:14 +0100 Subject: [PATCH] scaling: ensure min and max int64s are in toplevel of block. --- jobspec/parse_group.go | 2 ++ nomad/structs/funcs.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/jobspec/parse_group.go b/jobspec/parse_group.go index 44b25185e..7285551b1 100644 --- a/jobspec/parse_group.go +++ b/jobspec/parse_group.go @@ -337,6 +337,8 @@ func parseScalingPolicy(out **api.ScalingPolicy, list *ast.ObjectList) error { } valid := []string{ + "min", + "max", "policy", "enabled", } diff --git a/nomad/structs/funcs.go b/nomad/structs/funcs.go index 8e1abc6e2..da449a1ec 100644 --- a/nomad/structs/funcs.go +++ b/nomad/structs/funcs.go @@ -267,6 +267,8 @@ func CopyScalingPolicy(p *ScalingPolicy) *ScalingPolicy { ID: p.ID, Policy: opaquePolicyConfig.(map[string]interface{}), Enabled: p.Enabled, + Min: p.Min, + Max: p.Max, CreateIndex: p.CreateIndex, ModifyIndex: p.ModifyIndex, }