From e222c9641a15060fd8cb52a7fd0a783f10a2cee9 Mon Sep 17 00:00:00 2001 From: Tim Ebert Date: Thu, 19 Oct 2023 08:24:45 +0200 Subject: [PATCH] Disable HTTP2 and scale up API server to 4 replicas --- webhosting-operator/config/experiment/base/job.yaml | 3 +++ webhosting-operator/config/manager/default/manager.yaml | 3 +++ .../config/policy/controlplane/kube-apiserver-scale.yaml | 2 +- .../config/policy/controlplane/kube-apiserver.yaml | 2 +- .../tests/kube-apiserver-scale-awake/kyverno-test.yaml | 2 +- .../tests/kube-apiserver-scale-awake/scale_expected.yaml | 2 +- .../tests/kube-apiserver/kube-apiserver-awake_expected.yaml | 2 +- .../tests/kube-apiserver/kube-apiserver-null_expected.yaml | 2 +- .../controlplane/tests/kube-apiserver/kyverno-test.yaml | 4 ++-- 9 files changed, 14 insertions(+), 8 deletions(-) diff --git a/webhosting-operator/config/experiment/base/job.yaml b/webhosting-operator/config/experiment/base/job.yaml index 03ee2325..d3863c62 100644 --- a/webhosting-operator/config/experiment/base/job.yaml +++ b/webhosting-operator/config/experiment/base/job.yaml @@ -14,6 +14,9 @@ spec: image: experiment:latest args: - --zap-log-level=info + env: + - name: DISABLE_HTTP2 + value: "true" ports: - name: metrics containerPort: 8080 diff --git a/webhosting-operator/config/manager/default/manager.yaml b/webhosting-operator/config/manager/default/manager.yaml index e355f4a1..8bfd11e3 100644 --- a/webhosting-operator/config/manager/default/manager.yaml +++ b/webhosting-operator/config/manager/default/manager.yaml @@ -18,6 +18,9 @@ spec: image: controller:latest args: - --zap-log-level=info + env: + - name: DISABLE_HTTP2 + value: "true" ports: - name: metrics containerPort: 8080 diff --git a/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml b/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml index fe8eda77..7468ff71 100644 --- a/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml +++ b/webhosting-operator/config/policy/controlplane/kube-apiserver-scale.yaml @@ -28,4 +28,4 @@ spec: mutate: patchStrategicMerge: spec: - replicas: 1 + replicas: 4 diff --git a/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml b/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml index f74ab6a3..cd98ea64 100644 --- a/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml +++ b/webhosting-operator/config/policy/controlplane/kube-apiserver.yaml @@ -29,7 +29,7 @@ spec: mutate: patchStrategicMerge: spec: - replicas: 1 + replicas: 4 # set static requests/limits on kube-apiserver to ensure similar evaluation environment between load test runs - name: resources match: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/kyverno-test.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/kyverno-test.yaml index 92042fe1..bec2c941 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/kyverno-test.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/kyverno-test.yaml @@ -2,7 +2,7 @@ name: kube-apiserver-scale-awake policies: - ../../kube-apiserver-scale.yaml resources: -# spec.replicas=2 -> expect spec.replicas=1 +# spec.replicas=2 -> expect spec.replicas=4 - scale.yaml variables: variables.yaml results: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/scale_expected.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/scale_expected.yaml index 9a8da48c..817f8bb9 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/scale_expected.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver-scale-awake/scale_expected.yaml @@ -4,4 +4,4 @@ metadata: name: kube-apiserver namespace: shoot--timebertt--sharding spec: - replicas: 1 + replicas: 4 diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml index 07c91f7b..86097fee 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-awake_expected.yaml @@ -7,7 +7,7 @@ metadata: name: kube-apiserver-awake namespace: shoot--timebertt--sharding spec: - replicas: 1 + replicas: 4 template: spec: containers: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml index 0901cc6a..b61d5fa1 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kube-apiserver-null_expected.yaml @@ -7,7 +7,7 @@ metadata: name: kube-apiserver-null namespace: shoot--timebertt--sharding spec: - replicas: 1 + replicas: 4 template: spec: containers: diff --git a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml index 0185af6a..7aec544b 100644 --- a/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml +++ b/webhosting-operator/config/policy/controlplane/tests/kube-apiserver/kyverno-test.yaml @@ -2,9 +2,9 @@ name: kube-apiserver policies: - ../../kube-apiserver.yaml resources: -# spec.replicas=2 -> expect spec.replicas=1 +# spec.replicas=2 -> expect spec.replicas=4 - kube-apiserver-awake.yaml -# spec.replicas=null -> expect spec.replicas=1 +# spec.replicas=null -> expect spec.replicas=4 - kube-apiserver-null.yaml # spec.replicas=0 -> expect skip - kube-apiserver-hibernated.yaml