quota config changes

asm582 · asm582 · commit bdacd6bbbc2c · 2023-05-26T16:17:56.000-04:00
diff --git a/test/e2e-kuttl/install-quota-subtree.yaml b/test/e2e-kuttl/install-quota-subtree.yaml
@@ -40,6 +40,7 @@ spec:
   children:
     - name: gold
       quotas:
+        hardLimit: false
         requests:
           cpu: 1075m
           memory: 450Mi
diff --git a/test/e2e-kuttl/quota-forest/06-install.yaml b/test/e2e-kuttl/quota-forest/06-install.yaml
@@ -43,16 +43,8 @@ spec:
                       - while true; do sleep 10; done
                     resources:
                       requests:
-<<<<<<< HEAD
                         cpu: 600m
                         memory: 95Mi
                       limits:
                         cpu: 600m
                         memory: 95Mi
-=======
-                        cpu: "0.6m"
-                        memory: "95Mi"
-                      limits:
-                        cpu: "0.6m"
-                        memory: "95Mi"
->>>>>>> 7d1d38b9 (fix resorurce unit)
