Update Prometheus-adapter addon to version 0.6.0 #2441

Ebaneck · 2020-04-21T11:33:12Z

Component:

'charts', 'prometheus-adapter',

Context:

See #2431

Summary:

Bump Prometheus-adapter version to 0.6.0

Acceptance criteria:

No regression

[root@bootstrap vagrant]# kubectl top node bootstrap
NAME        CPU(cores)   CPU%   MEMORY(bytes)   MEMORY%   
bootstrap   346m         17%    2995Mi          81%

Closes: #2431

bert-e · 2020-04-21T11:33:14Z

Hello ebaneck,

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 · 2020-04-21T11:33:20Z

Integration data created

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

this pull request will merge improvement/2431-bump-prometheus-adapter-to-v0.6.0 into
development/2.5
w/2.6/improvement/2431-bump-prometheus-adapter-to-v0.6.0 will be merged into development/2.6

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

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

bert-e · 2020-04-21T11:33:22Z

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:

bert-e · 2020-04-23T17:12:22Z

History mismatch

Merge commit #33bed9827107f1b495503db7205d043673eedf05 on the integration branch
w/2.6/improvement/2431-bump-prometheus-adapter-to-v0.6.0 is merging a branch which is neither the current
branch improvement/2431-bump-prometheus-adapter-to-v0.6.0 nor the development branch
development/2.6.

It is likely due to a rebase of the branch improvement/2431-bump-prometheus-adapter-to-v0.6.0 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.

Ebaneck · 2020-04-23T17:46:49Z

/reset

bert-e · 2020-04-23T17:46:57Z

Reset complete

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

Ebaneck · 2020-04-23T17:46:57Z

/approve

bert-e · 2020-04-23T17:47:05Z

Integration data created

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

this pull request will merge improvement/2431-bump-prometheus-adapter-to-v0.6.0 into
development/2.5
w/2.6/improvement/2431-bump-prometheus-adapter-to-v0.6.0 will be merged into development/2.6

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

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 · 2020-04-23T17:47:07Z

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

TeddyAndrieux · 2020-04-23T17:50:19Z

charts/render.py

+    if args.service_configs:
+        sys.stdout.write(
+            START_BLOCK.format(
+                configlines='\n'.join(
+                    ("{{%- set {} = salt.metalk8s_service_configuration"
+                     ".get_service_conf('{}', '{}') %}}").format(
+                        service_config[0], args.namespace, service_config[1]
+                    ) for service_config in args.service_configs
+                )
+            ).lstrip()
+        )
+        sys.stdout.write('\n')
+    else:
+        sys.stdout.write(START_BLOCK.format(configlines='').lstrip())


Would prefer an if only to set a configlines variable and then having the write with format

Some charts do not have a service config argument but the renderer script enforces that we pass a service configuration. This commit ensures the `--service-config` argument is not mandatory while rendering the charts

bert-e · 2020-04-24T08:37:10Z

History mismatch

Merge commit #d07a599b1a4265c52ce98bef021b47fe97ac9320 on the integration branch
w/2.6/improvement/2431-bump-prometheus-adapter-to-v0.6.0 is merging a branch which is neither the current
branch improvement/2431-bump-prometheus-adapter-to-v0.6.0 nor the development branch
development/2.6.

It is likely due to a rebase of the branch improvement/2431-bump-prometheus-adapter-to-v0.6.0 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

This chart is render using: ``` $ rm -rf charts/prometheus-adapter $ helm repo update $ helm fetch -d charts --untar stable/prometheus-adapter $ ./charts/render.py prometheus-adapter --namespace metalk8s-monitoring charts/prometheus-adapter.yaml charts/prometheus-adapter/ > salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls ``` Closes #2431

Ebaneck · 2020-04-26T16:00:38Z

/reset

bert-e · 2020-04-26T16:00:45Z

Reset complete

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

The following options are set: approve

bert-e · 2020-04-26T16:00:54Z

Integration data created

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

this pull request will merge improvement/2431-bump-prometheus-adapter-to-v0.6.0 into
development/2.5
w/2.6/improvement/2431-bump-prometheus-adapter-to-v0.6.0 will be merged into development/2.6

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

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 · 2020-04-26T16:00:55Z

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

TeddyAndrieux

Not tested but changes LGTM

bert-e · 2020-04-27T08:46:51Z

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.5
✔️ development/2.6

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

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 · 2020-04-27T14:49:00Z

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

✔️ development/2.5
✔️ development/2.6

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

Please check the status of the associated issue None.

Goodbye ebaneck.

Ebaneck requested a review from a team as a code owner April 21, 2020 11:33

Ebaneck force-pushed the improvement/2431-bump-prometheus-adapter-to-v0.6.0 branch from a160a9d to 43c2150 Compare April 23, 2020 17:12

TeddyAndrieux reviewed Apr 23, 2020

View reviewed changes

renderer: remove mandatory --service-config argument

5eae563

Some charts do not have a service config argument but the renderer script enforces that we pass a service configuration. This commit ensures the `--service-config` argument is not mandatory while rendering the charts

Ebaneck force-pushed the improvement/2431-bump-prometheus-adapter-to-v0.6.0 branch from 43c2150 to d759f7b Compare April 24, 2020 08:37

Ebaneck force-pushed the improvement/2431-bump-prometheus-adapter-to-v0.6.0 branch from d759f7b to 0eb0962 Compare April 24, 2020 08:39

Ebaneck requested a review from TeddyAndrieux April 24, 2020 11:08

TeddyAndrieux approved these changes Apr 27, 2020

View reviewed changes

bert-e merged commit 0284a0b into development/2.5 Apr 27, 2020

bert-e deleted the improvement/2431-bump-prometheus-adapter-to-v0.6.0 branch April 27, 2020 14:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Prometheus-adapter addon to version 0.6.0 #2441

Update Prometheus-adapter addon to version 0.6.0 #2441

Ebaneck commented Apr 21, 2020

bert-e commented Apr 21, 2020

bert-e commented Apr 21, 2020

bert-e commented Apr 21, 2020

bert-e commented Apr 23, 2020

Ebaneck commented Apr 23, 2020

bert-e commented Apr 23, 2020

Ebaneck commented Apr 23, 2020

bert-e commented Apr 23, 2020

bert-e commented Apr 23, 2020

TeddyAndrieux Apr 23, 2020

bert-e commented Apr 24, 2020

Ebaneck commented Apr 26, 2020

bert-e commented Apr 26, 2020

bert-e commented Apr 26, 2020

bert-e commented Apr 26, 2020

TeddyAndrieux left a comment

bert-e commented Apr 27, 2020

bert-e commented Apr 27, 2020

Update Prometheus-adapter addon to version 0.6.0 #2441

Update Prometheus-adapter addon to version 0.6.0 #2441

Conversation

Ebaneck commented Apr 21, 2020

bert-e commented Apr 21, 2020

Hello ebaneck,

bert-e commented Apr 21, 2020

Integration data created

bert-e commented Apr 21, 2020

Waiting for approval

bert-e commented Apr 23, 2020

History mismatch

Ebaneck commented Apr 23, 2020

bert-e commented Apr 23, 2020

Reset complete

Ebaneck commented Apr 23, 2020

bert-e commented Apr 23, 2020

Integration data created

bert-e commented Apr 23, 2020

Waiting for approval

TeddyAndrieux Apr 23, 2020

Choose a reason for hiding this comment

bert-e commented Apr 24, 2020

History mismatch

Ebaneck commented Apr 26, 2020

bert-e commented Apr 26, 2020

Reset complete

bert-e commented Apr 26, 2020

Integration data created

bert-e commented Apr 26, 2020

Waiting for approval

TeddyAndrieux left a comment

Choose a reason for hiding this comment

bert-e commented Apr 27, 2020

In the queue

bert-e commented Apr 27, 2020