Merge remote-tracking branch 'upstream/main' into dev-1.24

2022-03-21 07:53:48 -07:00
parent 284c492292 6d22e08903
commit ee1a85d08e
42 changed files with 1549 additions and 1064 deletions
@@ -8,9 +8,9 @@ spec:
  - name: memory-demo-3-ctr
    image: polinux/stress
    resources:
-      limits:
-        memory: "1000Gi"
      requests:
        memory: "1000Gi"
+      limits:
+        memory: "1000Gi"
    command: ["stress"]
    args: ["--vm", "1", "--vm-bytes", "150M", "--vm-hang", "1"]
@@ -8,9 +8,9 @@ spec:
  - name: memory-demo-ctr
    image: polinux/stress
    resources:
-      limits:
-        memory: "200Mi"
      requests:
        memory: "100Mi"
+      limits:
+        memory: "200Mi"
    command: ["stress"]
    args: ["--vm", "1", "--vm-bytes", "150M", "--vm-hang", "1"]