Skip to content
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
merged 15 commits into from Sep 13, 2019

Conversation

lilic
Copy link

@lilic lilic commented Sep 12, 2019

s-urbaniak and others added 15 commits September 2, 2019 09:55
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 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 openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2019
@lilic
Copy link
Author

lilic commented Sep 12, 2019

/hold

@openshift-ci-robot 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
@s-urbaniak
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 12, 2019
@openshift-ci-robot
Copy link

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@lilic
Copy link
Author

lilic commented Sep 13, 2019

/hold cancel

@openshift-ci-robot 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
@openshift-merge-robot openshift-merge-robot merged commit 38109e4 into openshift:master Sep 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants