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

Bug 1862432: unmask prometheus-adapter service monitor #921

Merged
merged 5 commits into from Sep 10, 2020

Conversation

dgrisonnet
Copy link
Member

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

cc @s-urbaniak

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. label Sep 8, 2020
@openshift-ci-robot
Copy link
Contributor

@dgrisonnet: This pull request references Bugzilla bug 1862432, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1862432: unmask prometheus-adapter service monitor

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 8, 2020
@s-urbaniak
Copy link
Contributor

good initial start :+1 you'll have to deploy the service monitor in CMO's reconcile code, right after the deployment of prometheus-adapter:

err = t.client.CreateOrUpdateDeployment(dep)
if err != nil {
return errors.Wrap(err, "reconciling PrometheusAdapter Deployment failed")

Injecting the server name can be inspired from here:

func (f *Factory) PrometheusOperatorServiceMonitor() (*monv1.ServiceMonitor, error) {
sm, err := f.NewServiceMonitor(MustAssetReader(PrometheusOperatorServiceMonitor))
if err != nil {
return nil, err
}
sm.Namespace = f.namespace
sm.Spec.Endpoints[0].TLSConfig.ServerName = fmt.Sprintf("prometheus-operator.%s.svc", f.namespace)
return sm, nil
}

@dgrisonnet dgrisonnet force-pushed the bz-1862432 branch 3 times, most recently from ea13537 to d7a6d5d Compare September 8, 2020 13:27
@dgrisonnet
Copy link
Member Author

@s-urbaniak I added the cert and the service monitor reconciliation. PTAL

@s-urbaniak
Copy link
Contributor

one nit, else LGTM 👍

@s-urbaniak
Copy link
Contributor

Please rebase as we fixed the failing e2e test.

Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
@s-urbaniak
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, 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

@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 10, 2020
@openshift-merge-robot openshift-merge-robot merged commit 1877979 into openshift:master Sep 10, 2020
@openshift-ci-robot
Copy link
Contributor

@dgrisonnet: All pull requests linked via external trackers have merged:

Bugzilla bug 1862432 has been moved to the MODIFIED state.

In response to this:

Bug 1862432: unmask prometheus-adapter service monitor

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants