Deploy prometheus-adapter for metrics.k8s.io to be available #2057

NicolasT · 2019-11-19T23:43:52Z

Deploy and configure prometheus-adapter such that kubectl top nodes and kubectl top pods works.

bert-e · 2019-11-19T23:43:54Z

Hello nicolast,

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 · 2019-11-19T23:43:58Z

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:

NicolasT · 2019-11-19T23:44:05Z

~~Want to add some test(s) before moving forward with this.~~ Tests implemented.

We assume that if this API is available and returns 'expected' results, the `kubectl top` command works (since it uses this API under the hood). See: 241c355 See: #2049 See: #2057

bert-e · 2019-11-26T23:39:01Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.5/improvement/GH-2049-metrics-api with contents from improvement/GH-2049-metrics-api
and development/2.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.5/improvement/GH-2049-metrics-api origin/development/2.5
 $ git merge origin/improvement/GH-2049-metrics-api
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.5/improvement/GH-2049-metrics-api

bert-e · 2019-11-26T23:43:11Z

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:

We assume that if this API is available and returns 'expected' results, the `kubectl top` command works (since it uses this API under the hood). See: 241c355 See: #2049 See: #2057

bert-e · 2019-11-27T19:15:39Z

History mismatch

Merge commit #f2ee0002c061df41475316af2d5dd7531373c92e on the integration branch
w/2.5/improvement/GH-2049-metrics-api is merging a branch which is neither the current
branch improvement/GH-2049-metrics-api nor the development branch
development/2.5.

It is likely due to a rebase of the branch improvement/GH-2049-metrics-api 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.

NicolasT · 2019-11-27T19:18:40Z

/reset

bert-e · 2019-11-27T19:18:47Z

Reset complete

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

bert-e · 2019-11-27T19:18:52Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.5/improvement/GH-2049-metrics-api with contents from improvement/GH-2049-metrics-api
and development/2.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.5/improvement/GH-2049-metrics-api origin/development/2.5
 $ git merge origin/improvement/GH-2049-metrics-api
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.5/improvement/GH-2049-metrics-api

bert-e · 2019-11-27T19:37:42Z

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:

We assume that if this API is available and returns 'expected' results, the `kubectl top` command works (since it uses this API under the hood). See: 241c355 See: #2049 See: #2057

bert-e · 2019-12-02T11:53:31Z

History mismatch

Merge commit #667593c82dbd67d6e88d9c29419c388970d75e23 on the integration branch
w/2.5/improvement/GH-2049-metrics-api is merging a branch which is neither the current
branch improvement/GH-2049-metrics-api nor the development branch
development/2.5.

It is likely due to a rebase of the branch improvement/GH-2049-metrics-api 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.

NicolasT · 2019-12-02T11:53:41Z

/reset

bert-e · 2019-12-02T11:53:47Z

Reset complete

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

bert-e · 2019-12-02T11:53:52Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.5/improvement/GH-2049-metrics-api with contents from improvement/GH-2049-metrics-api
and development/2.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.5/improvement/GH-2049-metrics-api origin/development/2.5
 $ git merge origin/improvement/GH-2049-metrics-api
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.5/improvement/GH-2049-metrics-api

bert-e · 2019-12-02T12:13:10Z

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:

We assume that if this API is available and returns 'expected' results, the `kubectl top` command works (since it uses this API under the hood). See: 241c355 See: #2049 See: #2057

bert-e · 2019-12-03T11:26:11Z

History mismatch

Merge commit #eb1e0292203d721ed551251cb2c0e1cebfcd21e5 on the integration branch
w/2.5/improvement/GH-2049-metrics-api is merging a branch which is neither the current
branch improvement/GH-2049-metrics-api nor the development branch
development/2.5.

It is likely due to a rebase of the branch improvement/GH-2049-metrics-api 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.

NicolasT · 2019-12-03T11:26:20Z

/reset

bert-e · 2019-12-12T11:06:34Z

History mismatch

Merge commit #b004bff5d4740c941688defbaa027853b92e1964 on the integration branch
w/2.5/improvement/GH-2049-metrics-api is merging a branch which is neither the current
branch improvement/GH-2049-metrics-api nor the development branch
development/2.5.

It is likely due to a rebase of the branch improvement/GH-2049-metrics-api 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

NicolasT · 2019-12-12T11:06:43Z

/reset

bert-e · 2019-12-12T11:06:50Z

Reset complete

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

The following options are set: approve

bert-e · 2019-12-12T11:06:57Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.5/improvement/GH-2049-metrics-api with contents from improvement/GH-2049-metrics-api
and development/2.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.5/improvement/GH-2049-metrics-api origin/development/2.5
 $ git merge origin/improvement/GH-2049-metrics-api
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.5/improvement/GH-2049-metrics-api

The following options are set: approve

bert-e · 2019-12-12T11:23:03Z

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

An 'm1.medium' node is too small to run all services we now allocate to the bootstrap node. A proper set of infra nodes could remediate this over time...

This should enable the `metrics.k8s.io` API, and as such reinstate the `kubectl top` functionality and allow the `HorizontalPodAutoscaler` controller to work. The chart is rendered using ``` $ ./charts/render.py prometheus-adapter metalk8s-monitoring charts/prometheus-adapter.yaml charts/prometheus-adapter/ > salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls ``` Fixes: #2049 See: #2049

See: edf10ef See: #1624 See: #1630

We assume that if this API is available and returns 'expected' results, the `kubectl top` command works (since it uses this API under the hood). See: 241c355 See: #2049 See: #2057

bert-e · 2019-12-12T20:36:05Z

History mismatch

Merge commit #e7a8386c1df2a229ffde1cf75537714d2d11a2e2 on the integration branch
w/2.5/improvement/GH-2049-metrics-api is merging a branch which is neither the current
branch improvement/GH-2049-metrics-api nor the development branch
development/2.5.

It is likely due to a rebase of the branch improvement/GH-2049-metrics-api 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

NicolasT · 2019-12-12T21:52:09Z

/reset

bert-e · 2019-12-12T21:52:17Z

Reset complete

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

The following options are set: approve

bert-e · 2019-12-12T21:52:24Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.5/improvement/GH-2049-metrics-api with contents from improvement/GH-2049-metrics-api
and development/2.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.5/improvement/GH-2049-metrics-api origin/development/2.5
 $ git merge origin/improvement/GH-2049-metrics-api
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.5/improvement/GH-2049-metrics-api

The following options are set: approve

bert-e · 2019-12-12T22:01:54Z

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 · 2019-12-16T15:12:46Z

Conflict with a changeset in the queue

The changeset in this pull request conflicts with another changeset
already in the queue. Please wait for the current queue to merge into
the development branch. The conflict will then appear in this pull
request and can be sorted on the feature branch directly.

This changeset has not been added to the queue.

The following options are set: approve

…GH-2049-metrics-api * origin/development/2.4: ci: don't re-run bootstrap in multi-node tests salt: Add a version label on each Kubernetes objects salt: `def __virtualname__` ain't right salt, kubernetes: remove `apiServer` from `BootstrapConfiguration` scripts/iso-manager: override `metalk8s.api_server.kubeconfig` in Pillar salt, kubernetes: use the `apiserver-proxy` to connect to `kube-apiserver` kubernetes: use control-plane IP in generated `KubeConfig` salt: deploy a local proxy to `kube-apiserver` on all nodes kubernetes: add `127.0.0.1` to SAN of `kube-apiserver` cert buildchain/image: allow to save image in multiple formats at once buildchain: distribute `nginx` as tar *and* in registry salt: use consistent permissions on SA private key salt: remove `metalk8s.internal.init` images: don't use `etcd3` 0.11.0 in `salt-master` ci: explicitly source `/etc/profile` when running build docs: Add extra warning about Grafana customization docs: Improve upgrade/downgrade documentation salt: persist k8s passwd file salt: Store more etcd members informations in pillar Conflicts: CHANGELOG.md

bert-e · 2019-12-17T09:01:05Z

Conflict

A conflict has been raised during the update of
integration branch w/2.5/improvement/GH-2049-metrics-api with contents from improvement/GH-2049-metrics-api
and development/2.5.

Please resolve the conflict on the integration branch (w/2.5/improvement/GH-2049-metrics-api).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/2.5/improvement/GH-2049-metrics-api
 $ git pull  # or "git reset --hard origin/w/2.5/improvement/GH-2049-metrics-api"
 $ git merge origin/development/2.5
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/improvement/GH-2049-metrics-api
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.5/improvement/GH-2049-metrics-api

The following options are set: approve

bert-e · 2019-12-17T09:35:19Z

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 · 2019-12-17T20:16:40Z

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.4
✔️ development/2.5

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

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 · 2019-12-17T21:33:44Z

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

✔️ development/2.4
✔️ development/2.5

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

Please check the status of the associated issue GH-2049.

Goodbye nicolast.

NicolasT added kind:enhancement New feature or request topic:monitoring Everything related to monitoring of services in a running cluster labels Nov 19, 2019

NicolasT changed the title ~~Improvement/gh 2049 metrics api~~ Deploy prometheus-adapter for metrics.k8s.io to be available Nov 20, 2019

NicolasT force-pushed the improvement/GH-2049-metrics-api branch from c1c2b2a to 0ef19ac Compare November 26, 2019 23:38

NicolasT marked this pull request as ready for review November 26, 2019 23:43

NicolasT requested a review from a team as a code owner November 26, 2019 23:43

NicolasT force-pushed the improvement/GH-2049-metrics-api branch from 0ef19ac to f760900 Compare November 27, 2019 19:15

NicolasT force-pushed the improvement/GH-2049-metrics-api branch from f760900 to 86bc350 Compare December 2, 2019 11:53

NicolasT force-pushed the improvement/GH-2049-metrics-api branch from 86bc350 to 914930a Compare December 3, 2019 11:26

NicolasT added 4 commits December 12, 2019 21:35

ci: make multi-node bootstrap 'm1.large'

049647f

An 'm1.medium' node is too small to run all services we now allocate to the bootstrap node. A proper set of infra nodes could remediate this over time...

tests: re-instate metrics.k8s.io APIService test

ec577c8

See: edf10ef See: #1624 See: #1630

tests: test metrics.k8s.io/v1beta1

456cf72

We assume that if this API is available and returns 'expected' results, the `kubectl top` command works (since it uses this API under the hood). See: 241c355 See: #2049 See: #2057

NicolasT force-pushed the improvement/GH-2049-metrics-api branch from fdb97ef to 456cf72 Compare December 12, 2019 20:35

NicolasT requested review from alexandre-allard and a team December 12, 2019 23:17

NicolasT added this to the MetalK8s 2.4.2 milestone Dec 13, 2019

alexandre-allard previously approved these changes Dec 16, 2019

View reviewed changes

NicolasT dismissed alexandre-allard’s stale review via 9117868 December 17, 2019 09:00

NicolasT requested a review from alexandre-allard December 17, 2019 09:01

gdemonet approved these changes Dec 17, 2019

View reviewed changes

bert-e merged commit 9117868 into development/2.4 Dec 17, 2019

bert-e deleted the improvement/GH-2049-metrics-api branch December 17, 2019 21:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deploy prometheus-adapter for metrics.k8s.io to be available #2057

Deploy prometheus-adapter for metrics.k8s.io to be available #2057

NicolasT commented Nov 19, 2019

bert-e commented Nov 19, 2019

bert-e commented Nov 19, 2019

NicolasT commented Nov 19, 2019 •

edited

Loading

bert-e commented Nov 26, 2019

bert-e commented Nov 26, 2019

bert-e commented Nov 27, 2019

NicolasT commented Nov 27, 2019

bert-e commented Nov 27, 2019

bert-e commented Nov 27, 2019

bert-e commented Nov 27, 2019

bert-e commented Dec 2, 2019

NicolasT commented Dec 2, 2019

bert-e commented Dec 2, 2019

bert-e commented Dec 2, 2019

bert-e commented Dec 2, 2019

bert-e commented Dec 3, 2019

NicolasT commented Dec 3, 2019

bert-e commented Dec 12, 2019

NicolasT commented Dec 12, 2019

bert-e commented Dec 12, 2019

bert-e commented Dec 12, 2019

bert-e commented Dec 12, 2019

bert-e commented Dec 12, 2019

NicolasT commented Dec 12, 2019

bert-e commented Dec 12, 2019

bert-e commented Dec 12, 2019

bert-e commented Dec 12, 2019

bert-e commented Dec 16, 2019

bert-e commented Dec 17, 2019

bert-e commented Dec 17, 2019

bert-e commented Dec 17, 2019

bert-e commented Dec 17, 2019

Deploy prometheus-adapter for metrics.k8s.io to be available #2057

Deploy prometheus-adapter for metrics.k8s.io to be available #2057

Conversation

NicolasT commented Nov 19, 2019

bert-e commented Nov 19, 2019

Hello nicolast,

bert-e commented Nov 19, 2019

Waiting for approval

NicolasT commented Nov 19, 2019 • edited Loading

bert-e commented Nov 26, 2019

Conflict

bert-e commented Nov 26, 2019

Waiting for approval

bert-e commented Nov 27, 2019

History mismatch

NicolasT commented Nov 27, 2019

bert-e commented Nov 27, 2019

Reset complete

bert-e commented Nov 27, 2019

Conflict

bert-e commented Nov 27, 2019

Waiting for approval

bert-e commented Dec 2, 2019

History mismatch

NicolasT commented Dec 2, 2019

bert-e commented Dec 2, 2019

Reset complete

bert-e commented Dec 2, 2019

Conflict

bert-e commented Dec 2, 2019

Waiting for approval

bert-e commented Dec 3, 2019

History mismatch

NicolasT commented Dec 3, 2019

bert-e commented Dec 12, 2019

History mismatch

NicolasT commented Dec 12, 2019

bert-e commented Dec 12, 2019

Reset complete

bert-e commented Dec 12, 2019

Conflict

bert-e commented Dec 12, 2019

Waiting for approval

bert-e commented Dec 12, 2019

History mismatch

NicolasT commented Dec 12, 2019

bert-e commented Dec 12, 2019

Reset complete

bert-e commented Dec 12, 2019

Conflict

bert-e commented Dec 12, 2019

Waiting for approval

bert-e commented Dec 16, 2019

Conflict with a changeset in the queue

bert-e commented Dec 17, 2019

Conflict

bert-e commented Dec 17, 2019

Waiting for approval

bert-e commented Dec 17, 2019

In the queue

bert-e commented Dec 17, 2019

NicolasT commented Nov 19, 2019 •

edited

Loading