Skip to content
This repository was archived by the owner on Feb 22, 2022. It is now read-only.

[stable/prometheus-operator] update dependencies #11044

Merged
merged 4 commits into from
Feb 11, 2019
Merged

[stable/prometheus-operator] update dependencies #11044

merged 4 commits into from
Feb 11, 2019

Conversation

kvonbredow
Copy link
Contributor

Signed-off-by: Kyle von Bredow kylevonbredow@gmail.com

What this PR does / why we need it:

Updating the dependencies to incorporate the change to prometheus-node-exporter which allows the user to specify affinity and nodeSelector objects.

Which issue this PR fixes

Special notes for your reviewer:

Checklist

  • DCO signed
  • Chart Version bumped

@kvonbredow
Updating dependencies
cca2e6b 
Signed-off-by: Kyle von Bredow <kylevonbredow@gmail.com>
@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 31, 2019
@kvonbredow
Copy link
Contributor Author

/assign @gianrubio

gianrubio
gianrubio approved these changes Feb 1, 2019
View reviewed changes
Copy link
Collaborator

@gianrubio gianrubio left a comment

Choose a reason for hiding this comment

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

/ok-to-test
/lgtm

@k8s-ci-robot k8s-ci-robot added ok-to-test lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 1, 2019
@paskal
Copy link
Contributor

paskal commented Feb 1, 2019

@kvonbredow, have you tested these changes? Disregarding only minor version change in grafana they introduced some breaking changes. From what I see they should not break this chart, however it should be tested before going live for everyone.

@k8s-ci-robot k8s-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2019
@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 1, 2019
@kvonbredow
Copy link
Contributor Author

I tested the changes in my own cluster, and the changes themselves should only be additive (it added optional objects to the helm values). After taking a look, it seems someone simply got in before me and the chart version was hitting a merge conflict. I've caught my branch up with a merge and the tests are passing.

@jessesuen
Copy link
Contributor

I also submitted a change to this chart to update dependencies (#11110). However, this PR change came before a kube-state-metrics fix which we need #11094. I'm perfectly happy to close my PR in favor of this one, if we could get kube-state-metrics at 0.13.1.

@jessesuen jessesuen mentioned this pull request Feb 4, 2019
Closed
3 tasks
@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 4, 2019
@kvonbredow
Regenerated lock file for kube-state-metrics 0.13.1
994799a 
Signed-off-by: Kyle von Bredow <kylevonbredow@gmail.com>
@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 4, 2019
@kvonbredow
Copy link
Contributor Author

@jessesuen done!

@jessesuen
Copy link
Contributor

I just tested @kvonbredow's change and can confirm that everything seems to be working fine (on GKE) after the dependency updates.

@helm-bot helm-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 8, 2019
@paskal
Copy link
Contributor

paskal commented Feb 11, 2019

@davidkarlsen, could you please merge this one?

@cpanato
Copy link
Member

cpanato commented Feb 11, 2019

/retest

@cpanato
Copy link
Member

cpanato commented Feb 11, 2019

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, gianrubio, kvonbredow

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

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 11, 2019
@k8s-ci-robot k8s-ci-robot merged commit 8df3775 into helm:master Feb 11, 2019
tbuchier pushed a commit to tbuchier/charts that referenced this pull request Feb 14, 2019
@kvonbredow @tbuchier
[stable/prometheus-operator] update dependencies (helm#11044)
f18562f 
* Updating dependencies

Signed-off-by: Kyle von Bredow <kylevonbredow@gmail.com>

* Regenerated lock file for kube-state-metrics 0.13.1

Signed-off-by: Kyle von Bredow <kylevonbredow@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@paskal paskal paskal approved these changes

@gianrubio gianrubio gianrubio approved these changes

@viglesiasce viglesiasce Awaiting requested review from viglesiasce

Assignees

@gianrubio gianrubio

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@kvonbredow @paskal @jessesuen @cpanato @k8s-ci-robot @gianrubio @helm-bot