Merge pull request #30780 from hakuna-matatah/master

Disable oom tracker and restart-counts
kubernetes · Sep 21, 2023 · 0b9b3df · 0b9b3df
2 parents dda327a + 2436219
commit 0b9b3df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py
@@ -1144,6 +1144,8 @@ def generate_presubmits_scale():
                 'CL2_RATE_LIMIT_POD_CREATION': "false",
                 'NODE_MODE': "master",
                 'ENABLE_SYSTEM_POD_METRICS': "false",
+                'ENABLE_CLUSTER_OOMS_TRACKER': "false",
+                'ENABLE_RESTART_COUNT_CHECK': "false",
                 'CONTROL_PLANE_COUNT': "3",
                 'CONTROL_PLANE_SIZE': "c6g.16xlarge",
                 'KOPS_STATE_STORE' : "s3://k8s-infra-kops-scale-tests"
@@ -1171,6 +1173,8 @@ def generate_presubmits_scale():
                 'CL2_RATE_LIMIT_POD_CREATION': "false",
                 'NODE_MODE': "master",
                 'ENABLE_SYSTEM_POD_METRICS': "false",
+                'ENABLE_CLUSTER_OOMS_TRACKER': "false",
+                'ENABLE_RESTART_COUNT_CHECK': "false",
                 'KOPS_STATE_STORE' : "s3://k8s-infra-kops-scale-tests"
             }
         )

diff --git a/config/jobs/kubernetes/kops/kops-presubmits-scale.yaml b/config/jobs/kubernetes/kops/kops-presubmits-scale.yaml
@@ -128,6 +128,10 @@ presubmits:
           value: "master"
         - name: ENABLE_SYSTEM_POD_METRICS
           value: "false"
+        - name: ENABLE_CLUSTER_OOMS_TRACKER
+          value: "false"
+        - name: ENABLE_RESTART_COUNT_CHECK
+          value: "false"
         - name: CONTROL_PLANE_COUNT
           value: "3"
         - name: CONTROL_PLANE_SIZE
@@ -221,6 +225,10 @@ presubmits:
           value: "master"
         - name: ENABLE_SYSTEM_POD_METRICS
           value: "false"
+        - name: ENABLE_CLUSTER_OOMS_TRACKER
+          value: "false"
+        - name: ENABLE_RESTART_COUNT_CHECK
+          value: "false"
         - name: KOPS_STATE_STORE
           value: "s3://k8s-infra-kops-scale-tests"
         - name: CLOUD_PROVIDER