salt: Fix apiserver-proxy upstreams #2555

gdemonet · 2020-05-17T11:36:30Z

The previous approached relied on the pillar target
metalk8s:nodes:*:roles:master, which will always match all minions
since they all have access to the full metalk8s:nodes pillar value.
Instead, we use the metalk8s.minions_by_role execution method to
define the right target when retrieving control plane IPs from the mine.

We also change the metalk8s.minions_by_role method to handle
pillar errors gracefully, and let clients handle an empty list as they wish
(which was already the approach taken in the apiserver-proxy
configuration template, considering an empty result implies we are
bootstrapping).

The previous approached relied on the pillar target 'metalk8s:nodes:*:roles:master', which will always match all minions since they all have access to the full 'metalk8s:nodes' pillar value. Instead, we use the 'metalk8s.minions_by_role' execution method to define the right target when retrieving control plane IPs from the mine.

bert-e · 2020-05-17T11:36:32Z

Hello gdemonet,

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-05-17T11:36:41Z

Integration data created

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

this pull request will merge bugfix/apiserver-proxy-upstreams into
development/2.4
w/2.5/bugfix/apiserver-proxy-upstreams will be merged into development/2.5
w/2.6/bugfix/apiserver-proxy-upstreams 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

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-05-17T11:36: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:

gdemonet · 2020-05-18T07:05:07Z

/approve

bert-e · 2020-05-18T07:05:15Z

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 · 2020-05-18T07:06:40Z

History mismatch

Merge commit #f2738cd611eefc2582cedc18473f91cee4646f4e on the integration branch
w/2.5/bugfix/apiserver-proxy-upstreams is merging a branch which is neither the current
branch bugfix/apiserver-proxy-upstreams nor the development branch
development/2.5.

It is likely due to a rebase of the branch bugfix/apiserver-proxy-upstreams 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

bert-e · 2020-05-18T07:06: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

salt/_modules/metalk8s.py

bert-e · 2020-05-18T09:41:41Z

History mismatch

Merge commit #a674bdd085249f2fbf3e0ee9c5a0e7285f1326a4 on the integration branch
w/2.5/bugfix/apiserver-proxy-upstreams is merging a branch which is neither the current
branch bugfix/apiserver-proxy-upstreams nor the development branch
development/2.5.

It is likely due to a rebase of the branch bugfix/apiserver-proxy-upstreams 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

gdemonet · 2020-05-18T11:50:13Z

/reset

bert-e · 2020-05-18T11:50:21Z

Reset complete

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

The following options are set: approve

bert-e · 2020-05-18T11:50:41Z

Integration data created

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

this pull request will merge bugfix/apiserver-proxy-upstreams into
development/2.4
w/2.5/bugfix/apiserver-proxy-upstreams will be merged into development/2.5
w/2.6/bugfix/apiserver-proxy-upstreams 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

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-05-18T11:50: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:

The following options are set: approve

bert-e · 2020-05-19T14:42:19Z

History mismatch

Merge commit #35896c9d72e7a184a7e808fecad0c771c5f5f5d6 on the integration branch
w/2.5/bugfix/apiserver-proxy-upstreams is merging a branch which is neither the current
branch bugfix/apiserver-proxy-upstreams nor the development branch
development/2.5.

It is likely due to a rebase of the branch bugfix/apiserver-proxy-upstreams 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

salt/_modules/metalk8s.py

salt/metalk8s/kubernetes/apiserver-proxy/files/apiserver-proxy.conf.j2

The `metalk8s.minions_by_role` method now checks for those errors and raises a `CommandExecutionError` if there are some. The apiserver-proxy configuration template now handles more cases to ensure we only generate the configuration if there are master nodes, and also ensure we override `metalk8s:nodes:_errors` when bootstrapping.

gdemonet · 2020-05-20T07:53:17Z

/reset

gdemonet · 2020-05-20T07:53:21Z

/approve

bert-e · 2020-05-20T07:53:25Z

Reset complete

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

The following options are set: approve

bert-e · 2020-05-20T07:53:35Z

Integration data created

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

this pull request will merge bugfix/apiserver-proxy-upstreams into
development/2.4
w/2.5/bugfix/apiserver-proxy-upstreams will be merged into development/2.5
w/2.6/bugfix/apiserver-proxy-upstreams 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

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-05-20T07:53:36Z

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

LGTM

bert-e · 2020-05-20T08:35:29Z

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/apiserver-proxy-upstreams.

The following options are set: approve

bert-e · 2020-05-20T12:12:10Z

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
✔️ 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

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-05-20T13:13:47Z

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

✔️ development/2.4
✔️ 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

Please check the status of the associated issue None.

Goodbye gdemonet.

gdemonet added kind:bug Something isn't working topic:deployment Bugs in or enhancements to deployment stages complexity:easy Something that requires less than a day to fix labels May 17, 2020

gdemonet added this to the MetalK8s 2.4.4 milestone May 17, 2020

gdemonet requested a review from a team May 17, 2020 11:36

gdemonet marked this pull request as ready for review May 18, 2020 07:04

gdemonet changed the base branch from development/2.4 to development/2.0 May 18, 2020 07:06

gdemonet changed the base branch from development/2.0 to development/2.4 May 18, 2020 07:06

TeddyAndrieux reviewed May 18, 2020

View reviewed changes

salt/_modules/metalk8s.py Outdated Show resolved Hide resolved

gdemonet force-pushed the bugfix/apiserver-proxy-upstreams branch from a674bdd to e3c97e1 Compare May 18, 2020 09:41

gdemonet force-pushed the bugfix/apiserver-proxy-upstreams branch 2 times, most recently from d09888c to 35896c9 Compare May 18, 2020 10:52

gdemonet force-pushed the bugfix/apiserver-proxy-upstreams branch from 35896c9 to 73f131f Compare May 19, 2020 14:42

TeddyAndrieux reviewed May 19, 2020

View reviewed changes

salt/_modules/metalk8s.py Outdated Show resolved Hide resolved

TeddyAndrieux reviewed May 19, 2020

View reviewed changes

salt/metalk8s/kubernetes/apiserver-proxy/files/apiserver-proxy.conf.j2 Outdated Show resolved Hide resolved

gdemonet force-pushed the bugfix/apiserver-proxy-upstreams branch from 73f131f to 4c961ab Compare May 20, 2020 07:07

gdemonet requested a review from TeddyAndrieux May 20, 2020 07:54

TeddyAndrieux approved these changes May 20, 2020

View reviewed changes

bert-e merged commit 8aad5cc into development/2.4 May 20, 2020

bert-e deleted the bugfix/apiserver-proxy-upstreams branch May 20, 2020 13:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

salt: Fix apiserver-proxy upstreams #2555

salt: Fix apiserver-proxy upstreams #2555

gdemonet commented May 17, 2020

bert-e commented May 17, 2020

bert-e commented May 17, 2020

bert-e commented May 17, 2020

gdemonet commented May 18, 2020

bert-e commented May 18, 2020

bert-e commented May 18, 2020

bert-e commented May 18, 2020

bert-e commented May 18, 2020

gdemonet commented May 18, 2020

bert-e commented May 18, 2020

bert-e commented May 18, 2020

bert-e commented May 18, 2020

bert-e commented May 19, 2020

gdemonet commented May 20, 2020

gdemonet commented May 20, 2020

bert-e commented May 20, 2020

bert-e commented May 20, 2020

bert-e commented May 20, 2020

TeddyAndrieux left a comment

bert-e commented May 20, 2020

bert-e commented May 20, 2020

bert-e commented May 20, 2020

salt: Fix apiserver-proxy upstreams #2555

salt: Fix apiserver-proxy upstreams #2555

Conversation

gdemonet commented May 17, 2020

bert-e commented May 17, 2020

Hello gdemonet,

bert-e commented May 17, 2020

Integration data created

bert-e commented May 17, 2020

Waiting for approval

gdemonet commented May 18, 2020

bert-e commented May 18, 2020

Waiting for approval

bert-e commented May 18, 2020

History mismatch

bert-e commented May 18, 2020

Waiting for approval

bert-e commented May 18, 2020

History mismatch

gdemonet commented May 18, 2020

bert-e commented May 18, 2020

Reset complete

bert-e commented May 18, 2020

Integration data created

bert-e commented May 18, 2020

Waiting for approval

bert-e commented May 19, 2020

History mismatch

gdemonet commented May 20, 2020

gdemonet commented May 20, 2020

bert-e commented May 20, 2020

Reset complete

bert-e commented May 20, 2020

Integration data created

bert-e commented May 20, 2020

Waiting for approval

TeddyAndrieux left a comment

Choose a reason for hiding this comment

bert-e commented May 20, 2020

Build failed

bert-e commented May 20, 2020

In the queue

bert-e commented May 20, 2020