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

catalog: use service serving cert for ctrl mgr & use default prometheus scrape #7925

Merged
merged 1 commit into from
Apr 13, 2018

Conversation

jboyd01
Copy link
Contributor

@jboyd01 jboyd01 commented Apr 11, 2018

background in #7681 (review)

two issues:

  1. Use the annotation serving-cert-secret-name to create ssl cert and key.
  2. We don't need a custom prometheus scrape config, instead just add annotations to our service and use the default service endpoint scrape config.

This PR backs off changes from #7681. It matches changes for cluster up in openshift/origin#19286

I have not changed the Catalog API Server cert creation over to this method but I did create #7924 for tracking.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 11, 2018
@jboyd01
Copy link
Contributor Author

jboyd01 commented Apr 11, 2018

/assign sdodson

@jboyd01
Copy link
Contributor Author

jboyd01 commented Apr 12, 2018

/retest

@sdodson
Copy link
Member

sdodson commented Apr 12, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 12, 2018
@sdodson
Copy link
Member

sdodson commented Apr 12, 2018

bot, retest this please

@sdodson
Copy link
Member

sdodson commented Apr 13, 2018

/test gcp

@openshift-merge-robot openshift-merge-robot merged commit 142957d into openshift:master Apr 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants