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

MON-3749: enable request headers flags for metrics server #2293

Merged
merged 2 commits into from
Apr 9, 2024

Conversation

slashpai
Copy link
Member

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

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 28, 2024

@slashpai: This pull request references MON-3749 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

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

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 28, 2024
@openshift-ci openshift-ci bot requested review from machine424 and marioferh March 28, 2024 07:26
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2024
@slashpai
Copy link
Member Author

will update adding requestheader-client-ca-file as well

@slashpai slashpai marked this pull request as draft March 29, 2024 03:14
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 29, 2024
@slashpai slashpai marked this pull request as ready for review April 8, 2024 05:43
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 8, 2024
@openshift-ci openshift-ci bot requested a review from danielmellado April 8, 2024 05:43
@danielmellado
Copy link
Contributor

Small nit, can we squash (unless squash and merge is enabled in CMO repo) these commits before merging this?

@slashpai
Copy link
Member Author

slashpai commented Apr 8, 2024

Small nit, can we squash (unless squash and merge is enabled in CMO repo) these commits before merging this?

ya sure I wanted to verify if updated changes works needed to keep separate commit for easy update. First commit is already verified working. I can squash commit once I test the change locally :)

@slashpai
Copy link
Member Author

slashpai commented Apr 8, 2024

/skip
/retest-required

@danielmellado
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 8, 2024
Copy link
Contributor

openshift-ci bot commented Apr 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielmellado, slashpai

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:
  • OWNERS [danielmellado,slashpai]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@slashpai
Copy link
Member Author

slashpai commented Apr 8, 2024

/hold
To clarify a query about mount path

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 8, 2024
@slashpai
Copy link
Member Author

slashpai commented Apr 8, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 8, 2024
@slashpai
Copy link
Member Author

slashpai commented Apr 8, 2024

/retest-required

Copy link
Contributor

openshift-ci bot commented Apr 9, 2024

@slashpai: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-ovn-single-node ea9a603 link false /test e2e-aws-ovn-single-node
ci/prow/versions ea9a603 link false /test versions

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-bot openshift-merge-bot bot merged commit 9239b71 into openshift:master Apr 9, 2024
17 checks passed
Copy link
Contributor

@machine424 machine424 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you agree with my comments JP, I'd be happy to address them myself as the PR is already merged.
Hopefully metrics-server would learn to do this itself: kubernetes-sigs/metrics-server#1432

Comment on lines +2203 to +2204
"tls.crt": []byte(tlsCA),
"tls.key": []byte(tlsKey),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see where we mount/set these two.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- mountPath: /etc/tls/private
name: secret-metrics-server-tls

return fmt.Errorf("failed to create metrics-server secret: %w", err)
}

err = t.deleteOldMetricsServerSecrets(secret.Labels["monitoring.openshift.io/hash"])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to the PR: Couldn't this be replaced by a hash on the Deployment itself as we do for the certs?
So we have only one way of "reloading the Deployment if the secret changes".
(I'd create a ticket for that)
(cc @simonpasquier in case you know that this logic is needed for other things than reloading)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure either why this was there for prometheus-adapter as well. Happy to move to similar logic we have for other secrets if this is not needed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on doing that since we already use the other logic within MS.

@slashpai slashpai mentioned this pull request Apr 11, 2024
2 tasks
slashpai added a commit to slashpai/cluster-monitoring-operator that referenced this pull request Apr 19, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants