Adjust compute quotas

codeready-toolchain · Oct 16, 2024 · 91ab684 · 91ab684
1 parent a27f419
commit 91ab684
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/deploy/templates/nstemplatetiers/intellarge/cluster.yaml b/deploy/templates/nstemplatetiers/intellarge/cluster.yaml
@@ -13,6 +13,7 @@ objects:
         count/deployments.apps: "30"
         count/deploymentconfigs.apps: "30"
         count/pods: "50"
+        count/virtualmachines.kubevirt.io: "2"
     selector:
       annotations: null
       labels:

diff --git a/deploy/templates/nstemplatetiers/intellarge/ns_dev.yaml b/deploy/templates/nstemplatetiers/intellarge/ns_dev.yaml
@@ -75,7 +75,7 @@ objects:
     hard:
       limits.cpu: 16000m
       limits.memory: ${MEMORY_LIMIT}
-      requests.cpu: 8000m
+      requests.cpu: 16000m
       requests.memory: ${MEMORY_REQUEST}
 - apiVersion: v1
   kind: ResourceQuota
@@ -88,7 +88,7 @@ objects:
     hard:
       limits.cpu: 16000m
       limits.memory: ${MEMORY_BUILD_LIMIT}
-      requests.cpu: 8000m
+      requests.cpu: 16000m
       requests.memory: ${MEMORY_BUILD_REQUEST}
 - apiVersion: v1
   kind: ResourceQuota

diff --git a/deploy/templates/nstemplatetiers/intelmedium/cluster.yaml b/deploy/templates/nstemplatetiers/intelmedium/cluster.yaml
@@ -13,6 +13,7 @@ objects:
         count/deployments.apps: "30"
         count/deploymentconfigs.apps: "30"
         count/pods: "50"
+        count/virtualmachines.kubevirt.io: "2"
     selector:
       annotations: null
       labels:

diff --git a/deploy/templates/nstemplatetiers/intelmedium/ns_dev.yaml b/deploy/templates/nstemplatetiers/intelmedium/ns_dev.yaml
@@ -75,7 +75,7 @@ objects:
     hard:
       limits.cpu: 8000m
       limits.memory: ${MEMORY_LIMIT}
-      requests.cpu: 4000m
+      requests.cpu: 8000m
       requests.memory: ${MEMORY_REQUEST}
 - apiVersion: v1
   kind: ResourceQuota
@@ -88,7 +88,7 @@ objects:
     hard:
       limits.cpu: 8000m
       limits.memory: ${MEMORY_BUILD_LIMIT}
-      requests.cpu: 4000m
+      requests.cpu: 8000m
       requests.memory: ${MEMORY_BUILD_REQUEST}
 - apiVersion: v1
   kind: ResourceQuota

diff --git a/deploy/templates/usertiers/intel/tier.yaml b/deploy/templates/usertiers/intel/tier.yaml
@@ -12,6 +12,6 @@ objects:
     deactivationTimeoutDays: ${{DEACTIVATION_TIMEOUT_DAYS}}
 parameters:
 - name: NAMESPACE
-# Oct 18 to Nov 4 (inclusive)
+# 2 months for now
 - name: DEACTIVATION_TIMEOUT_DAYS
-  value: "18"
+  value: "60"
diff --git a/pkg/templates/usertiers/usertier_generator_whitebox_test.go b/pkg/templates/usertiers/usertier_generator_whitebox_test.go
@@ -192,7 +192,7 @@ func TestNewUserTier(t *testing.T) {
 				case "deactivate365":
 					assert.Equal(t, 365, tier.Spec.DeactivationTimeoutDays)
 				case "intel":
-					assert.Equal(t, 18, tier.Spec.DeactivationTimeoutDays)
+					assert.Equal(t, 60, tier.Spec.DeactivationTimeoutDays)
 				default:
 					require.Fail(t, "found unexpected tier", "tier '%s' found but not handled", tier.Name)
 				}