Update tests for base1ns namespace ResourceQuota (#1224)

* Update tests for base1ns namespace ResourceQuota

* Add checks for limits and CRQ for base tier too

* Update gotemplate tier

---------

Co-authored-by: Alexey Kazakov <alkazako@redhat.com>

Author: rajivnathan

deploy/base1ns-gotemplate/ns_dev.yaml

@@ -89,8 +89,10 @@ spec:
       hard:
         limits.cpu: '{{.CPU_LIMIT}}'
         limits.memory: '{{.MEMORY_LIMIT}}'
+        limits.nvidia.com/gpu: 0
         requests.cpu: '{{.CPU_REQUEST}}'
         requests.memory: '{{.MEMORY_REQUEST}}'
+        requests.nvidia.com/gpu: 0
       scopes:
         - NotTerminating
   - apiVersion: v1
@@ -102,8 +104,10 @@ spec:
       hard:
         limits.cpu: '{{.CPU_BUILD_LIMIT}}'
         limits.memory: '{{.MEMORY_BUILD_LIMIT}}'
+        limits.nvidia.com/gpu: 0
         requests.cpu: '{{.CPU_REQUEST}}'
         requests.memory: '{{.MEMORY_BUILD_REQUEST}}'
+        requests.nvidia.com/gpu: 0
       scopes:
         - Terminating
   - apiVersion: v1

testsupport/tiers/checks.go

@@ -166,7 +166,10 @@ func (a *baseTierChecks) GetExpectedTemplateRefs(t *testing.T, hostAwait *wait.H
 
 func (a *baseTierChecks) GetClusterObjectChecks() []clusterObjectsCheck {
 	return clusterObjectsChecks(
-		clusterResourceQuotaCompute(baseCPULimit, "6000m", "28Gi", "60Gi"),
+		clusterResourceQuotaCompute(baseCPULimit, "6000m", "28Gi", "60Gi", map[corev1.ResourceName]string{
+			corev1.ResourceName("requests.nvidia.com/gpu"): "0",
+			corev1.ResourceName("limits.nvidia.com/gpu"):   "0",
+		}),
 		clusterResourceQuotaDeployments(),
 		clusterResourceQuotaReplicas(),
 		clusterResourceQuotaRoutes(),
@@ -185,8 +188,14 @@ type base1nsTierChecks struct {
 
 func (a *base1nsTierChecks) GetNamespaceObjectChecks(_ string) []namespaceObjectsCheck {
 	checks := []namespaceObjectsCheck{
-		resourceQuotaComputeDeploy("30", "30Gi", "3", "30Gi"),
-		resourceQuotaComputeBuild("20", "14Gi", "3", "14Gi"),
+		resourceQuotaComputeDeploy("30", "30Gi", "3", "30Gi", map[corev1.ResourceName]string{
+			corev1.ResourceName("requests.nvidia.com/gpu"): "0",
+			corev1.ResourceName("limits.nvidia.com/gpu"):   "0",
+		}),
+		resourceQuotaComputeBuild("20", "14Gi", "3", "14Gi", map[corev1.ResourceName]string{
+			corev1.ResourceName("requests.nvidia.com/gpu"): "0",
+			corev1.ResourceName("limits.nvidia.com/gpu"):   "0",
+		}),
 		resourceQuotaStorage("15Gi", "80Gi", "15Gi", "10"),
 		limitRange("1", "1000Mi", "10m", "64Mi"),
 		numberOfLimitRanges(1),
@@ -317,7 +326,7 @@ type appstudioTierChecks struct {
 
 func commonAppstudioTierChecks() []namespaceObjectsCheck {
 	return []namespaceObjectsCheck{
-		resourceQuotaComputeDeploy("20", "32Gi", "1750m", "32Gi"),
+		resourceQuotaComputeDeploy("20", "32Gi", "1750m", "32Gi", nil),
 		limitRange("2", "2Gi", "10m", "256Mi"),
 		numberOfLimitRanges(1),
 		gitOpsServiceLabel(),
@@ -340,7 +349,7 @@ func commonAppstudioTierChecks() []namespaceObjectsCheck {
 func (a *appstudioTierChecks) GetNamespaceObjectChecks(_ string) []namespaceObjectsCheck {
 	checks := []namespaceObjectsCheck{
 		resourceQuotaStorage("50Gi", "200Gi", "50Gi", "90"),
-		resourceQuotaComputeBuild("120", "128Gi", "60", "64Gi"),
+		resourceQuotaComputeBuild("120", "128Gi", "60", "64Gi", nil),
 	}
 	checks = append(checks, commonAppstudioTierChecks()...)
 	checks = append(checks, append(commonNetworkPolicyChecks(), networkPolicyAllowFromCRW(), numberOfNetworkPolicies(7))...)
@@ -431,7 +440,7 @@ type appstudiolargeTierChecks struct {
 
 func (a *appstudiolargeTierChecks) GetNamespaceObjectChecks(_ string) []namespaceObjectsCheck {
 	checks := []namespaceObjectsCheck{
-		resourceQuotaComputeBuild("480", "512Gi", "240", "256Gi"),
+		resourceQuotaComputeBuild("480", "512Gi", "240", "256Gi", nil),
 		resourceQuotaStorage("50Gi", "400Gi", "50Gi", "180"),
 	}
 	checks = append(checks, commonAppstudioTierChecks()...)
@@ -459,7 +468,7 @@ type appstudioEnvTierChecks struct {
 
 func (a *appstudioEnvTierChecks) GetNamespaceObjectChecks(_ string) []namespaceObjectsCheck {
 	checks := []namespaceObjectsCheck{
-		resourceQuotaComputeDeploy("20", "32Gi", "1750m", "32Gi"),
+		resourceQuotaComputeDeploy("20", "32Gi", "1750m", "32Gi", nil),
 		zeroResourceQuotaComputeBuild(),
 		resourceQuotaStorage("50Gi", "50Gi", "50Gi", "12"),
 		limitRange("2", "2Gi", "10m", "256Mi"),
@@ -626,7 +635,7 @@ func rbacEditRole() spaceRoleObjectsCheck {
 	}
 }
 
-func resourceQuotaComputeDeploy(cpuLimit, memoryLimit, cpuRequest, memoryRequest string) namespaceObjectsCheck {
+func resourceQuotaComputeDeploy(cpuLimit, memoryLimit, cpuRequest, memoryRequest string, additionalResources map[corev1.ResourceName]string) namespaceObjectsCheck {
 	return func(t *testing.T, ns *corev1.Namespace, memberAwait *wait.MemberAwaitility, _ string) {
 		var err error
 		spec := corev1.ResourceQuotaSpec{
@@ -641,14 +650,18 @@ func resourceQuotaComputeDeploy(cpuLimit, memoryLimit, cpuRequest, memoryRequest
 		require.NoError(t, err)
 		spec.Hard[corev1.ResourceRequestsMemory], err = resource.ParseQuantity(memoryRequest)
 		require.NoError(t, err)
+		for resourceName, quantity := range additionalResources {
+			spec.Hard[resourceName], err = resource.ParseQuantity(quantity)
+			require.NoError(t, err)
+		}
 
 		criteria := resourceQuotaMatches(ns.Name, "compute-deploy", spec)
 		_, err = memberAwait.WaitForResourceQuota(t, ns.Name, "compute-deploy", criteria)
 		require.NoError(t, err)
 	}
 }
 
-func resourceQuotaComputeBuild(cpuLimit, memoryLimit, cpuRequest, memoryRequest string) namespaceObjectsCheck {
+func resourceQuotaComputeBuild(cpuLimit, memoryLimit, cpuRequest, memoryRequest string, additionalResources map[corev1.ResourceName]string) namespaceObjectsCheck {
 	return func(t *testing.T, ns *corev1.Namespace, memberAwait *wait.MemberAwaitility, _ string) {
 		var err error
 		spec := corev1.ResourceQuotaSpec{
@@ -663,6 +676,10 @@ func resourceQuotaComputeBuild(cpuLimit, memoryLimit, cpuRequest, memoryRequest
 		require.NoError(t, err)
 		spec.Hard[corev1.ResourceRequestsMemory], err = resource.ParseQuantity(memoryRequest)
 		require.NoError(t, err)
+		for resourceName, quantity := range additionalResources {
+			spec.Hard[resourceName], err = resource.ParseQuantity(quantity)
+			require.NoError(t, err)
+		}
 
 		criteria := resourceQuotaMatches(ns.Name, "compute-build", spec)
 		_, err = memberAwait.WaitForResourceQuota(t, ns.Name, "compute-build", criteria)
@@ -1099,7 +1116,7 @@ func idlers(timeoutSeconds int, namespaceTypes ...string) clusterObjectsCheckCre
 	}
 }
 
-func clusterResourceQuotaCompute(cpuLimit, cpuRequest, memoryLimit, storageLimit string) clusterObjectsCheckCreator { // nolint:unparam
+func clusterResourceQuotaCompute(cpuLimit, cpuRequest, memoryLimit, storageLimit string, additionalResources map[corev1.ResourceName]string) clusterObjectsCheckCreator { // nolint:unparam
 	return func() clusterObjectsCheck {
 		return func(t *testing.T, memberAwait *wait.MemberAwaitility, userName, tierLabel string) {
 			var err error
@@ -1120,6 +1137,10 @@ func clusterResourceQuotaCompute(cpuLimit, cpuRequest, memoryLimit, storageLimit
 			require.NoError(t, err)
 			hard[count(corev1.ResourcePersistentVolumeClaims)], err = resource.ParseQuantity("5")
 			require.NoError(t, err)
+			for resourceName, quantity := range additionalResources {
+				hard[resourceName], err = resource.ParseQuantity(quantity)
+				require.NoError(t, err)
+			}
 
 			_, err = memberAwait.WaitForClusterResourceQuota(t, fmt.Sprintf("for-%s-compute", userName),
 				crqToolchainLabelsWaitCriterion(userName),