move serving patch to file

skonto · Nov 1, 2023 · c428cdc · c428cdc
1 parent f476e18
commit c428cdc
Show file tree

Hide file tree

Showing 2 changed files with 147 additions and 1 deletion.
diff --git a/openshift/performance/scripts/run-all-performance-tests.sh b/openshift/performance/scripts/run-all-performance-tests.sh
@@ -47,7 +47,7 @@ if [[ "${ISOLATE_SERVERLESS:-false}" == "true" ]]; then
 
   oc patch knativeserving knative-serving \
     -n "${SYSTEM_NAMESPACE}" \
-    --type merge --patch '{"spec":{"workloads":[{"name":"activator","replicas":2,"resources":[{"container":"activator","requests":{"cpu":"500m","memory":"1000Mi"},"limits":{"cpu":"2000m","memory":"4000Mi"}}],"tolerations":[{"key":"knative-activator","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"knative-activator":"true"}},{"name":"controller","tolerations":[{"key":"serverless","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"serverless":"true"}},{"name":"domain-mapping","tolerations":[{"key":"serverless","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"serverless":"true"}},{"name":"domainmapping-webhook","tolerations":[{"key":"serverless","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"serverless":"true"}},{"name":"net-kourier-controller","tolerations":[{"key":"serverless","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"serverless":"true"}},{"name":"autoscaler","tolerations":[{"key":"serverless","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"serverless":"true"}},{"name":"webhook","tolerations":[{"key":"serverless","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"serverless":"true"}},{"name":"autoscaler-hpa","tolerations":[{"key":"serverless","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"serverless":"true"}},{"name":"3scale-kourier-gateway","tolerations":[{"key":"knative-ingress","operator":"Equal","effect":"NoSchedule","value":"true"}],"nodeSelector":{"knative-ingress":"true"}}]}}'
+    --type merge --patch-file "$(dirname "$0")/serving-patch.json"
 
   # enforce all pods to be re-scheduled on the new nodes only
   oc delete po --all -n knative-serving --force --grace-period=0

diff --git a/openshift/performance/scripts/serving-patch.json b/openshift/performance/scripts/serving-patch.json
@@ -0,0 +1,146 @@
+{
+  "spec": {
+    "workloads": [
+      {
+        "name": "activator",
+        "replicas": 2,
+        "resources": [
+          {
+            "container": "activator",
+            "requests": {
+              "cpu": "500m",
+              "memory": "1000Mi"
+            },
+            "limits": {
+              "cpu": "2000m",
+              "memory": "4000Mi"
+            }
+          }
+        ],
+        "tolerations": [
+          {
+            "key": "knative-activator",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "knative-activator": "true"
+        }
+      },
+      {
+        "name": "controller",
+        "tolerations": [
+          {
+            "key": "serverless",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "serverless": "true"
+        }
+      },
+      {
+        "name": "domain-mapping",
+        "tolerations": [
+          {
+            "key": "serverless",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "serverless": "true"
+        }
+      },
+      {
+        "name": "domainmapping-webhook",
+        "tolerations": [
+          {
+            "key": "serverless",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "serverless": "true"
+        }
+      },
+      {
+        "name": "net-kourier-controller",
+        "tolerations": [
+          {
+            "key": "serverless",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "serverless": "true"
+        }
+      },
+      {
+        "name": "autoscaler",
+        "tolerations": [
+          {
+            "key": "serverless",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "serverless": "true"
+        }
+      },
+      {
+        "name": "webhook",
+        "tolerations": [
+          {
+            "key": "serverless",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "serverless": "true"
+        }
+      },
+      {
+        "name": "autoscaler-hpa",
+        "tolerations": [
+          {
+            "key": "serverless",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "serverless": "true"
+        }
+      },
+      {
+        "name": "3scale-kourier-gateway",
+        "tolerations": [
+          {
+            "key": "knative-ingress",
+            "operator": "Equal",
+            "effect": "NoSchedule",
+            "value": "true"
+          }
+        ],
+        "nodeSelector": {
+          "knative-ingress": "true"
+        }
+      }
+    ]
+  }
+}