Merge release 0.30.1#30
Merged
openshift-merge-robot merged 408 commits intoopenshift:masterfrom Jun 4, 2019
Merged
Conversation
pkg/alertmanager/statefulset: Update to v0.16.1
Signed-off-by: Tamal Saha <tamal@appscode.com>
Signed-off-by: Tamal Saha <tamal@appscode.com>
Update client libraries to Kubernetes 1.13
Update component versions in docs and jsonnets
Fixed paths for patching manifests
FIx typo in README.md
Rename DeadMansSwitch to Watchdog
custom metrics API quick fix
…i-groups Update API groups in examples and Documentation
…e-servicemonitors Add prometheus-operator Service and Servicemonitor to Bundle
Users installing the bundle.yaml most likely do not yet have the ServiceMonitor CRD available in their cluster, therefore having this object in the bundle.yaml would break them
…clude-service-monitor Ignore ServiceMonitor in bundle.yaml
Signed-off-by: Vasily <v.sliouniaev@gmail.com>
Publish patch release 0.30.1
openshift-ci-robot
added
the
size/XXL
paulfantom
force-pushed
the
merge-release-0.30.1
branch
from
6ce3349 to
169fb1a
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: paulfantom, s-urbaniak The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
wking
added a commit
to wking/openshift-release
that referenced
this pull request
Jun 11, 2019
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a vanilla git merge with upstream. Plus added migration to golang 1.12 and updated repo ownership.
/cc @s-urbaniak @brancz