forked from prometheus-operator/prometheus-operator
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Sync with the 0.33 release #38
Merged
openshift-merge-robot
merged 15 commits into
openshift:master
from
prometheus-operator:master
Sep 13, 2019
Merged
Sync with the 0.33 release #38
openshift-merge-robot
merged 15 commits into
openshift:master
from
prometheus-operator:master
Sep 13, 2019
Conversation
This file contains 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
... as it was removed #2739.
scripts/jsonnet/Dockerfile: re-enable python-yaml
Since this image is use only by CI systems I don't see much benefit in optimizing its size and number of layers. In this case it only clouds Dockerfile readability. Additionally it breaks already established CI pipelines.
scripts/jsonnet: revert optimizations in jsonnet-ci image
Signed-off-by: yeya24 <yb532204897@gmail.com>
bump thanos image and version
Currently, for service discovery of Prometheus instances a separate headless service must be deployed. This adds the Thanos grpc port to the existing Prometheus statefulset governing service if a Thanos sidecar is given in the Prometheus custom resource specification. This way no additional service has to be deployed.
pkg/prometheus: add Thanos service port to governing service
Add VolumeMounts to Alertmanager
Cut the 0.33.0 version release
openshift-ci-robot
added
the
size/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
label
Sep 12, 2019
openshift-ci-robot
added
the
approved
Indicates a PR has been approved by an approver from all required OWNERS files.
label
Sep 12, 2019
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
Indicates that a PR should not merge because someone has issued a /hold command.
label
Sep 12, 2019
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: LiliC, s-urbaniak The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
Indicates that a PR should not merge because someone has issued a /hold command.
label
Sep 13, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
cc @s-urbaniak