Our larger RHTAP tenants need more memory quota

deploy/templates/nstemplatetiers/appstudio/ns_tenant.yaml

@@ -39,7 +39,6 @@ objects:
     scopes:
     - NotTerminating
     hard:
-      limits.cpu: "20"
       limits.memory: ${MEMORY_LIMIT}
       requests.cpu: 1750m
       requests.memory: ${MEMORY_REQUEST}
@@ -52,9 +51,8 @@ objects:
     scopes:
     - Terminating
     hard:
-      limits.cpu: "120"
       limits.memory: ${MEMORY_BUILD_LIMIT}
-      requests.cpu: "12"
+      requests.cpu: ${CPU_BUILD_REQUEST}
       requests.memory: ${MEMORY_BUILD_REQUEST}
 - apiVersion: v1
   kind: ResourceQuota
@@ -156,10 +154,9 @@ objects:
     limits:
     - type: "Container"
       default:
-        cpu: 2000m
         memory: 2Gi
       defaultRequest:
-        cpu: 10m
+        cpu: 200m
         memory: 256Mi
 
 - apiVersion: networking.k8s.io/v1
@@ -271,5 +268,7 @@ parameters:
   value: "32Gi"
 - name: MEMORY_BUILD_LIMIT
   value: "128Gi"
+- name: CPU_BUILD_REQUEST
+  value: "12"
 - name: MEMORY_BUILD_REQUEST
   value: "64Gi"

deploy/templates/nstemplatetiers/appstudiolarge/based_on_tier.yaml

@@ -12,3 +12,9 @@ parameters:
   value: "300"
 - name: SECRET_QUOTA
   value: "300"
+- name: MEMORY_BUILD_LIMIT
+  value: "512Gi"
+- name: CPU_BUILD_REQUEST
+  value: "24"
+- name: MEMORY_BUILD_REQUEST
+  value: "128Gi"

pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go

@@ -40,16 +40,17 @@ var expectedProdTiers = map[string]bool{
 	"appstudio-env":      false,
 }
 
+// tier_name: true/false (if based on the other tier)
 var expectedTestTiers = map[string]bool{
-	"advanced":  true, // tier_name: true/false (if based on the other tier)
+	"advanced":  true,
 	"base":      false,
 	"nocluster": false,
 	"appstudio": false,
 }
 
 func nsTypes(tier string) []string {
 	switch tier {
-	case "appstudio":
+	case "appstudio", "appstudiolarge":
 		return []string{"tenant"}
 	case "appstudio-env":
 		return []string{"env"}
@@ -62,7 +63,7 @@ func nsTypes(tier string) []string {
 
 func roles(tier string) []string {
 	switch tier {
-	case "appstudio", "appstudio-env":
+	case "appstudio", "appstudiolarge", "appstudio-env":
 		return []string{"admin", "maintainer", "contributor"}
 	default:
 		return []string{"admin"}
@@ -173,7 +174,7 @@ func TestLoadTemplatesByTiers(t *testing.T) {
 			tmpls, err := loadTemplatesByTiers(assets)
 			// then
 			require.NoError(t, err)
-			require.Len(t, tmpls, 4)
+			require.Len(t, tmpls, 4)             // advanced,appstudio,base,nocluster
 			require.NotContains(t, "foo", tmpls) // make sure that the `foo: bar` entry was ignored
 
 			for _, tier := range tiers(expectedTestTiers) {
@@ -599,11 +600,27 @@ func assertNamespaceTemplate(t *testing.T, decoder runtime.Decoder, actual templ
 	} else {
 		templatePath = fmt.Sprintf("%s/ns_%s.yaml", tier, typeName)
 	}
+	t.Logf("checking template '%s' (based on another tier: %t)", templatePath, basedOnOtherTier(expectedTiers, tier))
 	content, err := assets.Asset(templatePath)
 	require.NoError(t, err)
 	expected := templatev1.Template{}
 	_, _, err = decoder.Decode(content, nil, &expected)
 	require.NoError(t, err)
+	// then override the templates' parameters (if applicable)
+	if basedOnOtherTier(expectedTiers, tier) {
+		content, err = assets.Asset(fmt.Sprintf("%s/based_on_tier.yaml", tier))
+		require.NoError(t, err)
+		extension := BasedOnTier{}
+		err = yaml.Unmarshal(content, &extension)
+		require.NoError(t, err)
+		for i, p := range expected.Parameters {
+			for _, ep := range extension.Parameters {
+				if p.Name == ep.Name {
+					expected.Parameters[i].Value = ep.Value
+				}
+			}
+		}
+	}
 	assert.Equal(t, expected, actual)
 	assert.NotEmpty(t, actual.Objects)
 }

test/templates/nstemplatetiers/appstudio/cluster.yaml

@@ -6,30 +6,138 @@ objects:
 - apiVersion: quota.openshift.io/v1
   kind: ClusterResourceQuota
   metadata:
-    name: for-${SPACE_NAME}-compute
+    name: for-${SPACE_NAME}-deployments
   spec:
     quota:
       hard:
-        limits.cpu: 20000m
-        limits.memory: ${MEMORY_LIMIT}
-        limits.ephemeral-storage: 7Gi
-        requests.cpu: 1750m
-        requests.memory: ${MEMORY_REQUEST}
-        requests.storage: 15Gi
-        requests.ephemeral-storage: 7Gi
-        count/persistentvolumeclaims: "5"
+        count/deployments.apps: ${{DEPLOYMENT_QUOTA}}
+        count/deploymentconfigs.apps: ${{DEPLOYMENT_QUOTA}}
+        count/pods: ${{POD_QUOTA}}
     selector:
       annotations: null
       labels:
         matchLabels:
           toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: quota.openshift.io/v1
+  kind: ClusterResourceQuota
+  metadata:
+    name: for-${SPACE_NAME}-replicas
+  spec:
+    quota:
+      hard:
+        count/replicasets.apps: ${{REPLICASET_QUOTA}}
+        count/replicationcontrollers: ${{REPLICASET_QUOTA}}
+    selector:
+      annotations: null
+      labels:
+        matchLabels:
+          toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: quota.openshift.io/v1
+  kind: ClusterResourceQuota
+  metadata:
+    name: for-${SPACE_NAME}-routes
+  spec:
+    quota:
+      hard:
+        count/ingresses.extensions: ${{ROUTE_QUOTA}}
+        count/routes.route.openshift.io: ${{ROUTE_QUOTA}}
+    selector:
+      annotations: null
+      labels:
+        matchLabels:
+          toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: quota.openshift.io/v1
+  kind: ClusterResourceQuota
+  metadata:
+    name: for-${SPACE_NAME}-jobs
+  spec:
+    quota:
+      hard:
+        count/jobs.batch: "30"
+        count/daemonsets.apps: "30"
+        count/cronjobs.batch: "30"
+        count/statefulsets.apps: "30"
+    selector:
+      annotations: null
+      labels:
+        matchLabels:
+          toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: quota.openshift.io/v1
+  kind: ClusterResourceQuota
+  metadata:
+    name: for-${SPACE_NAME}-services
+  spec:
+    quota:
+      hard:
+        count/services: ${{SERVICE_QUOTA}}
+    selector:
+      annotations: null
+      labels:
+        matchLabels:
+          toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: quota.openshift.io/v1
+  kind: ClusterResourceQuota
+  metadata:
+    name: for-${SPACE_NAME}-bc
+  spec:
+    quota:
+      hard:
+        count/buildconfigs.build.openshift.io: "30"
+    selector:
+      annotations: null
+      labels:
+        matchLabels:
+          toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: quota.openshift.io/v1
+  kind: ClusterResourceQuota
+  metadata:
+    name: for-${SPACE_NAME}-secrets
+  spec:
+    quota:
+      hard:
+        count/secrets: ${{SECRET_QUOTA}}
+    selector:
+      annotations: null
+      labels:
+        matchLabels:
+          toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: quota.openshift.io/v1
+  kind: ClusterResourceQuota
+  metadata:
+    name: for-${SPACE_NAME}-cm
+  spec:
+    quota:
+      hard:
+        count/configmaps: ${{CONFIGMAP_QUOTA}}
+    selector:
+      annotations: null
+      labels:
+        matchLabels:
+          toolchain.dev.openshift.com/space: ${SPACE_NAME}
+- apiVersion: toolchain.dev.openshift.com/v1alpha1
+  kind: Idler
+  metadata:
+    name: ${SPACE_NAME}
+  spec:
+    timeoutSeconds: ${{IDLER_TIMEOUT_SECONDS}}
 parameters:
 - name: SPACE_NAME
   required: true
 - name: IDLER_TIMEOUT_SECONDS
-  # 12 hours
-  value: "43200"
-- name: MEMORY_LIMIT
-  value: "7Gi"
-- name: MEMORY_REQUEST
-  value: "7Gi"
+  # No Idling
+  value: "0"
+# Quota
+- name: REPLICASET_QUOTA
+  value: "30"
+- name: DEPLOYMENT_QUOTA
+  value: "30"
+- name: POD_QUOTA
+  value: "300"
+- name: ROUTE_QUOTA
+  value: "30"
+- name: SERVICE_QUOTA
+  value: "30"
+- name: CONFIGMAP_QUOTA
+  value: "100"
+- name: SECRET_QUOTA
+  value: "100"