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

MGMT-14756: Add tls config for the service monitor #5282

Merged

Conversation

carbonin
Copy link
Member

@carbonin carbonin commented Jun 7, 2023

This is identical to how the API server handles configuring its service monitor and it also is using service serving certs.

Also remove some complication from the newServiceMonitor function and remove the http port from the config as metrics are only served over https.

List all the issues related to this PR

Resolves https://issues.redhat.com/browse/MGMT-14756

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

Manually deployed the operator build from this branch and saw that the service monitor was deployed correctly.

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see [CONTRIBUTING] guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

This is identical to how the API server handles configuring its service
monitor and it also is using service serving certs.

Also remove some complication from the `newServiceMonitor` function and
remove the http port from the config as metrics are only served over
https.

Resolves https://issues.redhat.com/browse/MGMT-14756
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 7, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 7, 2023

@carbonin: This pull request references MGMT-14756 which is a valid jira issue.

In response to this:

This is identical to how the API server handles configuring its service monitor and it also is using service serving certs.

Also remove some complication from the newServiceMonitor function and remove the http port from the config as metrics are only served over https.

List all the issues related to this PR

Resolves https://issues.redhat.com/browse/MGMT-14756

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

Manually deployed the operator build from this branch and saw that the service monitor was deployed correctly.

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

Checklist

  • Title and description added to both, commit and PR.
  • Relevant issues have been associated (see [CONTRIBUTING] guide)
  • This change does not require a documentation update (docstring, docs, README, etc)
  • Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

  • Are the title and description (in both PR and commit) meaningful and clear?
  • Is there a bug required (and linked) for this change?
  • Should this PR be backported?

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 openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 7, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jun 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carbonin

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 7, 2023
@codecov
Copy link

codecov bot commented Jun 7, 2023

Codecov Report

Merging #5282 (636cd38) into master (74b1520) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #5282   +/-   ##
=======================================
  Coverage   67.49%   67.49%           
=======================================
  Files         221      221           
  Lines       33016    33039   +23     
=======================================
+ Hits        22283    22299   +16     
- Misses       8723     8728    +5     
- Partials     2010     2012    +2     
Impacted Files Coverage Δ
...oller/controllers/agentserviceconfig_controller.go 84.99% <100.00%> (+0.06%) ⬆️

... and 3 files with indirect coverage changes

@carbonin
Copy link
Member Author

carbonin commented Jun 7, 2023

/retest

@carbonin carbonin requested review from omertuc and removed request for danielerez and avishayt June 7, 2023 18:42
@carbonin
Copy link
Member Author

carbonin commented Jun 7, 2023

@omertuc can you take a look at this one?

@omertuc
Copy link
Contributor

omertuc commented Jun 8, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 8, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 8bd5437 and 2 for PR HEAD 636cd38 in total

@openshift-ci
Copy link

openshift-ci bot commented Jun 8, 2023

@carbonin: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit db30aab into openshift:master Jun 8, 2023
16 checks passed
@carbonin
Copy link
Member Author

carbonin commented Jun 8, 2023

/cherry-pick release-ocm-2.8

@carbonin carbonin deleted the service-monitor-tls branch June 8, 2023 15:28
@openshift-cherrypick-robot

@carbonin: new pull request created: #5289

In response to this:

/cherry-pick release-ocm-2.8

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.

danielerez pushed a commit to danielerez/assisted-service that referenced this pull request Oct 15, 2023
This is identical to how the API server handles configuring its service
monitor and it also is using service serving certs.

Also remove some complication from the `newServiceMonitor` function and
remove the http port from the config as metrics are only served over
https.

Resolves https://issues.redhat.com/browse/MGMT-14756
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.

None yet

5 participants