From 7eb64eb239785246293c39547db4a95a32de9adf Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 11 Jun 2019 03:40:30 -0700 Subject: [PATCH] ci-operator/templates/openshift: m4.xlarge compute nodes Prometheus starting making memory requests with openshift/prometheus-operator@cda68a3f (Merge pull request openshift/prometheus-operator#30 from paulfantom/merge-release-0.30.1, 2019-06-04): $ diff -u <(curl -s https://storage.googleapis.com/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-serial-4.2/591/artifacts/e2e-aws-serial/pods.json | jq '.items[] | select(.metadata.name | contains("prometheus")) | {name: .metadata.name, resources: [.spec.containers[].resources | select((. | length) > 0)]}') <(curl -s https://storage.googleapis.com/origin-ci-test/logs/release-openshift-origin-installer-e2e-aws-serial-4.2/592/artifacts/e2e-aws-serial/pods.json | jq '.items[] | select(.metadata.name | contains("prometheus")) | {name: .metadata.name, resources: [.spec.containers[].resources | select((. | length) > 0)]}') --- /dev/fd/63 2019-06-04 14:10:31.908436038 -0700 +++ /dev/fd/62 2019-06-04 14:10:31.908436038 -0700 @@ -1,5 +1,5 @@ { - "name": "prometheus-adapter-5f78cc955d-2899k", + "name": "prometheus-adapter-64f4f64b7-pvmhn", "resources": [ { "requests": { @@ -10,7 +10,7 @@ ] } { - "name": "prometheus-adapter-5f78cc955d-2rlnx", + "name": "prometheus-adapter-64f4f64b7-tgnld", "resources": [ { "requests": { @@ -22,14 +22,56 @@ } { "name": "prometheus-k8s-0", - "resources": [] + "resources": [ + { + "limits": { + "cpu": "100m", + "memory": "25Mi" + }, + "requests": { + "cpu": "100m", + "memory": "25Mi" + } + }, + { + "limits": { + "cpu": "100m", + "memory": "25Mi" + }, + "requests": { + "cpu": "100m", + "memory": "25Mi" + } + } + ] } { "name": "prometheus-k8s-1", - "resources": [] + "resources": [ + { + "limits": { + "cpu": "100m", + "memory": "25Mi" + }, + "requests": { + "cpu": "100m", + "memory": "25Mi" + } + }, + { + "limits": { + "cpu": "100m", + "memory": "25Mi" + }, + "requests": { + "cpu": "100m", + "memory": "25Mi" + } + } + ] } { - "name": "prometheus-operator-68f7b6bd55-hmqtj", + "name": "prometheus-operator-d8745bf44-l9khn", "resources": [ { "requests": { With that change, our nodes no longer satisfied the assumptions that the SchedulerPreemption tests make about the schedule load on test nodes (i.e. less than 40% of capacity is scheduled). openshift/origin@13b6d0e4a7 (test/e2e: scheduling: disable preemption tests, 2019-06-04, openshift/origin#23029) disabled the test, but this change takes the alternative temporary workaround of bumping our node capacity to re-satisfy the existing test's assumptions. We have sufficient capacity for doubling our xlarge consumption: $ export AWS_PROFILE=ci $ aws --region us-east-1 support describe-trusted-advisor-checks --language en --query "checks[? category == 'service_limits'].{id: @.id, name: @.name}" --output text | grep 'EC2 On-Demand Instances' 0Xc6LMYG8P EC2 On-Demand Instances $ AWS_PROFILE=ci aws --region us-east-1 support describe-trusted-advisor-check-result --check-id 0Xc6LMYG8P --query "join(\`\\n\`, result.flaggedResources[].join(\`\\t\`, [@.metadata[4] || '0', @.metadata[3], @.region || '-', '0Xc6LMYG8P', @.metadata[2]]))" --output text 91 3000 us-east-1 0Xc6LMYG8P On-Demand instances - m4.large 97 3000 us-east-1 0Xc6LMYG8P On-Demand instances - m4.xlarge --- .../openshift/installer/cluster-launch-installer-console.yaml | 1 + .../openshift/installer/cluster-launch-installer-e2e.yaml | 1 + .../openshift/installer/cluster-launch-installer-src.yaml | 1 + .../openshift/installer/cluster-launch-installer-upi-e2e.yaml | 1 + .../openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml index 579624ff23575..9d76ddea07bf6 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-console.yaml @@ -248,6 +248,7 @@ objects: replicas: 3 platform: aws: + type: m4.xlarge zones: - us-east-1a - us-east-1b diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index 381592b81b937..3ddac49680d98 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -595,6 +595,7 @@ objects: replicas: 3 platform: aws: + type: m4.xlarge zones: - us-east-1a - us-east-1b diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index 1a7f484280cbc..4958cddf1a893 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -254,6 +254,7 @@ objects: replicas: 3 platform: aws: + type: m4.xlarge zones: - us-east-1a - us-east-1b diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml index 5bd9e242fe68c..115ef57fea16f 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml @@ -559,6 +559,7 @@ objects: ParameterKey=WorkerSecurityGroupId,ParameterValue="${WORKER_SECURITY_GROUP}" \ ParameterKey=IgnitionLocation,ParameterValue="https://api-int.${CLUSTER_NAME}.${BASE_DOMAIN}:22623/config/worker" \ ParameterKey=CertificateAuthorities,ParameterValue="${IGNITION_CA}" \ + ParameterKey=WorkerInstanceType=m4.xlarge \ ParameterKey=WorkerInstanceProfileName,ParameterValue="${WORKER_INSTANCE_PROFILE}" & wait "$!" diff --git a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml index 4f51242f404f2..2a4756d7bece1 100644 --- a/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml +++ b/ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml @@ -247,6 +247,7 @@ objects: replicas: 3 platform: aws: + type: m4.xlarge zones: - us-east-1a - us-east-1b