salt: Ensure node exists before marking it as bootstrap #2610

TeddyAndrieux · 2020-06-08T17:33:58Z

Component:

'salt'

Context:

Summary:

In restore script, we configure a new bootstrap node according to a
backup file and just after kubelet installation we try to mark the node
as bootstrap node but kubelet may take some time to register so the
salt state may fail.
This commit adds a state to check that the node exists with a retry logic
in case kubelet not register yet when calling the salt state

Fixes: #2601

bert-e · 2020-06-08T17:34:00Z

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 · 2020-06-08T17:34:09Z

Integration data created

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

this pull request will merge bugfix/GH-2601-fix-bootstrap-restore into
development/2.4
w/2.5/bugfix/GH-2601-fix-bootstrap-restore will be merged into development/2.5
w/2.6/bugfix/GH-2601-fix-bootstrap-restore 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-06-08T17:34: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:

gdemonet

Small change on the helper, otherwise LGTM!

salt/_modules/metalk8s_kubernetes.py

bert-e · 2020-06-09T07:26:59Z

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 reviewers are expecting changes from the author, or must review again:

@gdemonet

Add a function in our kubernetes custom salt module to check that a kubernetes object exists or not

bert-e · 2020-06-09T08:07:04Z

History mismatch

Merge commit #1bbd182c1fad5f6bc80de147892482ec225b7548 on the integration branch
w/2.5/bugfix/GH-2601-fix-bootstrap-restore is merging a branch which is neither the current
branch bugfix/GH-2601-fix-bootstrap-restore nor the development branch
development/2.5.

It is likely due to a rebase of the branch bugfix/GH-2601-fix-bootstrap-restore 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.

TeddyAndrieux · 2020-06-09T08:07:12Z

/reset

bert-e · 2020-06-09T08:07:20Z

Reset complete

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

TeddyAndrieux · 2020-06-09T08:07:25Z

/approve

bert-e · 2020-06-09T08:07:30Z

Integration data created

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

this pull request will merge bugfix/GH-2601-fix-bootstrap-restore into
development/2.4
w/2.5/bugfix/GH-2601-fix-bootstrap-restore will be merged into development/2.5
w/2.6/bugfix/GH-2601-fix-bootstrap-restore 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-06-09T08:07:31Z

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 reviewers are expecting changes from the author, or must review again:

@gdemonet

bert-e · 2020-06-09T08:07:39Z

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 reviewers are expecting changes from the author, or must review again:

@gdemonet

The following options are set: approve

bert-e · 2020-06-09T08:22:27Z

Build failed

The build for commit did not succeed in branch bugfix/GH-2601-fix-bootstrap-restore.

The following options are set: approve

In restore script we configure a new bootstrap node according to a backup file and just after kubelet installation we try to mark the node as bootstrap node but kubelet may take some time to register so the salt state may fail. This commit add a state to check that the node exists with a retry logic in case kubelet not register yet when calling the salt state Fixes: #2601

bert-e · 2020-06-09T08:25:45Z

History mismatch

Merge commit #19de953e234c91d0a0002efc3f0f6a3b456d1cc2 on the integration branch
w/2.5/bugfix/GH-2601-fix-bootstrap-restore is merging a branch which is neither the current
branch bugfix/GH-2601-fix-bootstrap-restore nor the development branch
development/2.5.

It is likely due to a rebase of the branch bugfix/GH-2601-fix-bootstrap-restore 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 · 2020-06-09T08:25:52Z

/reset

bert-e · 2020-06-09T08:26:00Z

Reset complete

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

The following options are set: approve

bert-e · 2020-06-09T08:26:10Z

Integration data created

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

this pull request will merge bugfix/GH-2601-fix-bootstrap-restore into
development/2.4
w/2.5/bugfix/GH-2601-fix-bootstrap-restore will be merged into development/2.5
w/2.6/bugfix/GH-2601-fix-bootstrap-restore 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-06-09T08:26:12Z

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-06-09T09:10:57Z

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/GH-2601-fix-bootstrap-restore.

The following options are set: approve

bert-e · 2020-06-09T09:45:34Z

Build failed

The build for commit did not succeed in branch w/2.6/bugfix/GH-2601-fix-bootstrap-restore.

The following options are set: approve

bert-e · 2020-06-09T13:22:12Z

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-06-09T13:22:46Z

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 GH-2601.

Goodbye teddyandrieux.

TeddyAndrieux requested a review from a team June 8, 2020 17:33

gdemonet suggested changes Jun 9, 2020

View reviewed changes

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

salt: Add helper to check if k8s object exists

22a3eac

Add a function in our kubernetes custom salt module to check that a kubernetes object exists or not

TeddyAndrieux force-pushed the bugfix/GH-2601-fix-bootstrap-restore branch from affec23 to 19de953 Compare June 9, 2020 08:06

TeddyAndrieux requested a review from gdemonet June 9, 2020 08:15

gdemonet previously approved these changes Jun 9, 2020

View reviewed changes

TeddyAndrieux dismissed gdemonet’s stale review via 37abdfd June 9, 2020 08:25

TeddyAndrieux force-pushed the bugfix/GH-2601-fix-bootstrap-restore branch from 19de953 to 37abdfd Compare June 9, 2020 08:25

gdemonet approved these changes Jun 9, 2020

View reviewed changes

alexandre-allard approved these changes Jun 9, 2020

View reviewed changes

bert-e merged commit 37abdfd into development/2.4 Jun 9, 2020

bert-e deleted the bugfix/GH-2601-fix-bootstrap-restore branch June 9, 2020 13:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

salt: Ensure node exists before marking it as bootstrap #2610

salt: Ensure node exists before marking it as bootstrap #2610

TeddyAndrieux commented Jun 8, 2020

bert-e commented Jun 8, 2020

bert-e commented Jun 8, 2020

bert-e commented Jun 8, 2020

gdemonet left a comment

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

TeddyAndrieux commented Jun 9, 2020

bert-e commented Jun 9, 2020

TeddyAndrieux commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

TeddyAndrieux commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

bert-e commented Jun 9, 2020

salt: Ensure node exists before marking it as bootstrap #2610

salt: Ensure node exists before marking it as bootstrap #2610

Conversation

TeddyAndrieux commented Jun 8, 2020

bert-e commented Jun 8, 2020

Hello teddyandrieux,

bert-e commented Jun 8, 2020

Integration data created

bert-e commented Jun 8, 2020

Waiting for approval

gdemonet left a comment

Choose a reason for hiding this comment

bert-e commented Jun 9, 2020

Waiting for approval

bert-e commented Jun 9, 2020

History mismatch

TeddyAndrieux commented Jun 9, 2020

bert-e commented Jun 9, 2020

Reset complete

TeddyAndrieux commented Jun 9, 2020

bert-e commented Jun 9, 2020

Integration data created

bert-e commented Jun 9, 2020

Waiting for approval

bert-e commented Jun 9, 2020

Waiting for approval

bert-e commented Jun 9, 2020

Build failed

bert-e commented Jun 9, 2020

History mismatch

TeddyAndrieux commented Jun 9, 2020

bert-e commented Jun 9, 2020

Reset complete

bert-e commented Jun 9, 2020

Integration data created

bert-e commented Jun 9, 2020

Waiting for approval

bert-e commented Jun 9, 2020

Build failed

bert-e commented Jun 9, 2020

Build failed

bert-e commented Jun 9, 2020

In the queue

bert-e commented Jun 9, 2020