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

charts,build: update prometheus-adapter to 2.10.1 #3007

Merged

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'monitoring'

Summary:

Bump prometheus-adapter chart to 2.10.1


@TeddyAndrieux TeddyAndrieux added kind:debt Technical debt complexity:easy Something that requires less than a day to fix topic:monitoring Everything related to monitoring of services in a running cluster labels Jan 4, 2021
@TeddyAndrieux TeddyAndrieux requested a review from a team January 4, 2021 17:28
@bert-e
Copy link
Contributor

bert-e commented Jan 4, 2021

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jan 4, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-prometheus-adapter-to-2101 branch from f092966 to 2de79b3 Compare January 4, 2021 17:29
gdemonet
gdemonet previously approved these changes Jan 5, 2021
Comment on lines -306 to +307
namespace: metalk8s-monitoring
namespace: kube-system
Copy link
Contributor

Choose a reason for hiding this comment

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

Why would this RoleBinding need to live in kube-system?

Copy link
Contributor

Choose a reason for hiding this comment

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

Answering my own question: prometheus-community/helm-charts@1a2157d

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

History mismatch

Merge commit #02a68fa43cfd5099759b26627d310cc0783dea05 on the integration branch
w/2.8/improvement/bump-prometheus-adapter-to-2101 is merging a branch which is neither the current
branch improvement/bump-prometheus-adapter-to-2101 nor the development branch
development/2.8.

It is likely due to a rebase of the branch improvement/bump-prometheus-adapter-to-2101 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

History mismatch

Merge commit #bb67ecea2dd2e16fcff5d43bda1400c778136695 on the integration branch
w/2.8/improvement/bump-prometheus-adapter-to-2101 is merging a branch which is neither the current
branch improvement/bump-prometheus-adapter-to-2101 nor the development branch
development/2.8.

It is likely due to a rebase of the branch improvement/bump-prometheus-adapter-to-2101 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

Update the image downloaded in the buildchain for prometheus-adapter.

Update the prometheus-adapter chart using:
```
rm -rf charts/prometheus-adapter/
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
helm repo update
helm fetch -d charts --untar prometheus-community/prometheus-adapter
```

And then re-rendering using:
```
./charts/render.py prometheus-adapter --namespace metalk8s-monitoring \
  charts/prometheus-adapter.yaml  charts/prometheus-adapter/ \
  > salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls
```
@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

History mismatch

Merge commit #2de79b307a21274f80c6a0823c8076c36c97c90c on the integration branch
w/2.8/improvement/bump-prometheus-adapter-to-2101 is merging a branch which is neither the current
branch improvement/bump-prometheus-adapter-to-2101 nor the development branch
development/2.8.

It is likely due to a rebase of the branch improvement/bump-prometheus-adapter-to-2101 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.7

  • ✔️ development/2.8

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 5, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.7

  • ✔️ development/2.8

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 1bf7421 into development/2.7 Jan 5, 2021
@bert-e bert-e deleted the improvement/bump-prometheus-adapter-to-2101 branch January 5, 2021 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix kind:debt Technical debt topic:monitoring Everything related to monitoring of services in a running cluster
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants