Skip to content
This repository has been archived by the owner on Dec 4, 2024. It is now read-only.

prometheus: disable controller-manager and scheduler serviceMonitors #474

Merged
merged 1 commit into from
Aug 26, 2020
Merged

prometheus: disable controller-manager and scheduler serviceMonitors #474

merged 1 commit into from
Aug 26, 2020

Conversation

dkoshkin
Copy link
Contributor

@dkoshkin dkoshkin commented Aug 26, 2020 •
edited by joejulian
Loading

Signed-off-by: Dimitri Koshkin [email protected]

What type of PR is this?

Bug

What this PR does/ why we need it:

Which issue(s) this PR fixes:

https://jira.d2iq.com/browse/D2IQ-71303

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

prometheus: disable ServiceMonitors for kube-controller-manager and kube-scheduler. kubernetes has determined the ports that were used for these tests was insecure and has limited it to localhost only. This causes these specific tests to fail. The state of the controller-manager and scheduler pods are still tracked in general as pods.

Checklist

  • The commit message explains the changes and why are needed.
  • The code builds and passes lint/style checks locally.
  • The relevant subset of integration tests pass locally.
  • The core changes are covered by tests.
  • The documentation is updated where needed.

@dkoshkin dkoshkin added the backport stable Backport this PR to the stable branch (only for critical bugs in production) label Aug 26, 2020
@dkoshkin dkoshkin requested a review from a team as a code owner August 26, 2020 17:02
@dkoshkin dkoshkin self-assigned this Aug 26, 2020
alejandroEsc
alejandroEsc approved these changes Aug 26, 2020
View reviewed changes
Copy link
Contributor

@alejandroEsc alejandroEsc left a comment

Choose a reason for hiding this comment

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

Should we bump the file revision? This is a fairly significant change. Not blocking.

@joejulian joejulian merged commit 829ec63 into master Aug 26, 2020
@joejulian joejulian deleted the dkoshkin-prom branch August 26, 2020 17:19
joejulian pushed a commit that referenced this pull request Aug 26, 2020
@dkoshkin @joejulian
prometheus: disable controller-manager and scheduler serviceMonitors (#…
76adbe7 
…474)

Signed-off-by: Dimitri Koshkin <[email protected]>
(cherry picked from commit 829ec63)
joejulian pushed a commit that referenced this pull request Aug 26, 2020
@dkoshkin @joejulian
prometheus: disable controller-manager and scheduler serviceMonitors (#…
8d8d649 
…474)

Signed-off-by: Dimitri Koshkin <[email protected]>
(cherry picked from commit 829ec63)
joejulian added a commit that referenced this pull request Aug 26, 2020
@joejulian
Revert "prometheus: disable controller-manager and scheduler serviceM…
3abf467 
…onitors (#474)"

This reverts commit 829ec63.
@dkoshkin dkoshkin mentioned this pull request Aug 26, 2020
Merged
5 tasks
joejulian added a commit that referenced this pull request Aug 27, 2020
@joejulian
backport #474 to release 2.2.0
76799e4
joejulian added a commit that referenced this pull request Aug 27, 2020
@joejulian
backport #474 to release 2.2.0 (#478)
96a7b9b
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alejandroEsc alejandroEsc alejandroEsc approved these changes

@branden branden branden approved these changes

@joejulian joejulian Awaiting requested review from joejulian

@gracedo gracedo Awaiting requested review from gracedo

Assignees

@dkoshkin dkoshkin

Labels
backport stable Backport this PR to the stable branch (only for critical bugs in production)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dkoshkin @branden @alejandroEsc @joejulian