Backport of fix(control-plane): sidecar CPU limit incorrectly validat…

…ed against CPU request into release/1.3.x (#3212) backport of commit 78db847 Co-authored-by: DanStough <dan.stough@hashicorp.com>
hashicorp · Nov 14, 2023 · 36898a2 · 36898a2
1 parent ad84047
commit 36898a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.changelog/3209.txt b/.changelog/3209.txt
@@ -0,0 +1,4 @@
+```release-note:bug
+control-plane: Fixes a bug with the control-plane CLI validation where the consul-dataplane sidecar CPU request is
+compared against the memory limit instead of the CPU limit.
+```
diff --git a/control-plane/subcommand/inject-connect/command.go b/control-plane/subcommand/inject-connect/command.go
@@ -461,7 +461,7 @@ func (c *Command) parseAndValidateSidecarProxyFlags() error {
 			return fmt.Errorf("-default-sidecar-proxy-cpu-limit is invalid: %w", err)
 		}
 	}
-	if c.sidecarProxyCPULimit.Value() != 0 && c.sidecarProxyCPURequest.Cmp(c.sidecarProxyMemoryLimit) > 0 {
+	if c.sidecarProxyCPULimit.Value() != 0 && c.sidecarProxyCPURequest.Cmp(c.sidecarProxyCPULimit) > 0 {
 		return fmt.Errorf("request must be <= limit: -default-sidecar-proxy-cpu-request value of %q is greater than the -default-sidecar-proxy-cpu-limit value of %q",
 			c.flagDefaultSidecarProxyCPURequest, c.flagDefaultSidecarProxyCPULimit)
 	}