From f08f06abc06e073b299cd3987bc38c0d5948cf66 Mon Sep 17 00:00:00 2001 From: Alexey Kazakov Date: Wed, 1 Nov 2023 21:38:59 -0700 Subject: [PATCH] Introduce appstudio large tier (#908) --- .../nstemplatetiers/appstudio/cluster.yaml | 35 +++++++++++++------ .../appstudiolarge/based_on_tier.yaml | 14 ++++++++ .../nstemplatetier_generator_whitebox_test.go | 1 + 3 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 deploy/templates/nstemplatetiers/appstudiolarge/based_on_tier.yaml diff --git a/deploy/templates/nstemplatetiers/appstudio/cluster.yaml b/deploy/templates/nstemplatetiers/appstudio/cluster.yaml index b58066a6e..6bac357e3 100644 --- a/deploy/templates/nstemplatetiers/appstudio/cluster.yaml +++ b/deploy/templates/nstemplatetiers/appstudio/cluster.yaml @@ -10,9 +10,9 @@ objects: spec: quota: hard: - count/deployments.apps: "30" - count/deploymentconfigs.apps: "30" - count/pods: "300" + count/deployments.apps: ${{DEPLOYMENT_QUOTA}} + count/deploymentconfigs.apps: ${{DEPLOYMENT_QUOTA}} + count/pods: ${{POD_QUOTA}} selector: annotations: null labels: @@ -25,8 +25,8 @@ objects: spec: quota: hard: - count/replicasets.apps: "30" - count/replicationcontrollers: "30" + count/replicasets.apps: ${{REPLICASET_QUOTA}} + count/replicationcontrollers: ${{REPLICASET_QUOTA}} selector: annotations: null labels: @@ -39,8 +39,8 @@ objects: spec: quota: hard: - count/ingresses.extensions: "30" - count/routes.route.openshift.io: "30" + count/ingresses.extensions: ${{ROUTE_QUOTA}} + count/routes.route.openshift.io: ${{ROUTE_QUOTA}} selector: annotations: null labels: @@ -69,7 +69,7 @@ objects: spec: quota: hard: - count/services: "30" + count/services: ${{SERVICE_QUOTA}} selector: annotations: null labels: @@ -95,7 +95,7 @@ objects: spec: quota: hard: - count/secrets: "100" + count/secrets: ${{SECRET_QUOTA}} selector: annotations: null labels: @@ -108,7 +108,7 @@ objects: spec: quota: hard: - count/configmaps: "100" + count/configmaps: ${{CONFIGMAP_QUOTA}} selector: annotations: null labels: @@ -126,3 +126,18 @@ parameters: - name: IDLER_TIMEOUT_SECONDS # 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" diff --git a/deploy/templates/nstemplatetiers/appstudiolarge/based_on_tier.yaml b/deploy/templates/nstemplatetiers/appstudiolarge/based_on_tier.yaml new file mode 100644 index 000000000..4317dd425 --- /dev/null +++ b/deploy/templates/nstemplatetiers/appstudiolarge/based_on_tier.yaml @@ -0,0 +1,14 @@ +from: appstudio +parameters: +- name: REPLICASET_QUOTA + value: "100" +- name: DEPLOYMENT_QUOTA + value: "100" +- name: ROUTE_QUOTA + value: "100" +- name: SERVICE_QUOTA + value: "100" +- name: CONFIGMAP_QUOTA + value: "300" +- name: SECRET_QUOTA + value: "300" diff --git a/pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go b/pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go index 55d49856d..c2777ecc7 100644 --- a/pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go +++ b/pkg/templates/nstemplatetiers/nstemplatetier_generator_whitebox_test.go @@ -36,6 +36,7 @@ var expectedProdTiers = map[string]bool{ "baseextendedidling": true, "test": false, "appstudio": false, + "appstudiolarge": true, "appstudio-env": false, }