salt,tests: Handle a 409 conflict error when using `metalk8s_kubernetes.object_present` #4317

ezekiel-alexrod · 2024-04-18T10:16:34Z

Handle a 409 conflict error when using metalk8s_kubernetes.object_present Salt state due to another component modifying the wanted object

bert-e · 2024-04-18T10:16:38Z

Hello ezekiel-alexrod,

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.

Available options

name	description	privileged	authored
`/after_pull_request`	Wait for the given pull request id to be merged before continuing with the current one.
`/bypass_author_approval`	Bypass the pull request author's approval	⭐
`/bypass_build_status`	Bypass the build and test status	⭐
`/bypass_commit_size`	Bypass the check on the size of the changeset `TBA`	⭐
`/bypass_incompatible_branch`	Bypass the check on the source branch prefix	⭐
`/bypass_jira_check`	Bypass the Jira issue check	⭐
`/bypass_peer_approval`	Bypass the pull request peers' approval	⭐
`/bypass_leader_approval`	Bypass the pull request leaders' approval	⭐
`/approve`	Instruct Bert-E that the author has approved the pull request.		✍️
`/create_pull_requests`	Allow the creation of integration pull requests.
`/create_integration_branches`	Allow the creation of integration branches.
`/no_octopus`	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
`/unanimity`	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
`/wait`	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
`/help`	Print Bert-E's manual in the pull request.
`/status`	Print Bert-E's current status in the pull request `TBA`
`/clear`	Remove all comments from Bert-E from the history `TBA`
`/retry`	Re-start a fresh build `TBA`
`/build`	Re-start a fresh build `TBA`
`/force_reset`	Delete integration branches & pull requests, and restart merge process from the beginning.
`/reset`	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

bert-e · 2024-04-18T10:16:42Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

ezekiel-alexrod · 2024-04-18T13:59:59Z

/create_integration_branches

bert-e · 2024-04-18T14:00:10Z

Integration data created

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

this pull request will merge bugfix/conflict-409-replace-object into
development/127.0
w/128.0/bugfix/conflict-409-replace-object will be merged into development/128.0

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

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: create_integration_branches

bert-e · 2024-04-18T14:00: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: create_integration_branches

salt/_states/metalk8s_kubernetes.py

salt/_modules/metalk8s_kubernetes.py

CHANGELOG.md

bert-e · 2024-04-18T19:06:05Z

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: create_integration_branches

salt/_states/metalk8s_kubernetes.py

…es.object_present`

bert-e · 2024-04-19T09:31: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: create_integration_branches

bert-e · 2024-04-19T10:02: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: create_integration_branches

TeddyAndrieux

LGTM

ezekiel-alexrod · 2024-04-19T12:09:48Z

/approve

bert-e · 2024-04-19T12:36:06Z

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

✔️ development/127.0
✔️ development/128.0

The following branches have NOT changed:

development/123.0
development/124.0
development/124.1
development/125.0
development/126.0
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue CONFLICT-409.

Goodbye ezekiel-alexrod.

The following options are set: approve, create_integration_branches

- Handle a 409 conflict error when using `metalk8s_kubernetes.object_present` Salt state due to another component modifying the wanted object (PR[#4317](#4317)) - Following to Alert Manager Bump the test email feature from the UI wasn't working correctly. (PR[#4322](#4322))

ezekiel-alexrod requested a review from a team as a code owner April 18, 2024 10:16

ezekiel-alexrod force-pushed the bugfix/conflict-409-replace-object branch 2 times, most recently from ae37fa4 to 63b0450 Compare April 18, 2024 13:36

ezekiel-alexrod changed the title ~~salt: Handle a 409 conflict error when using metalk8s_kubernetes.object_present~~ salt,tests: Handle a 409 conflict error when using metalk8s_kubernetes.object_present Apr 18, 2024

TeddyAndrieux reviewed Apr 18, 2024

View reviewed changes

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

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

CHANGELOG.md Outdated Show resolved Hide resolved

ezekiel-alexrod force-pushed the bugfix/conflict-409-replace-object branch from 63b0450 to d5089dc Compare April 18, 2024 16:26

This comment was marked as resolved.

Sign in to view

ezekiel-alexrod force-pushed the bugfix/conflict-409-replace-object branch from d5089dc to 6380974 Compare April 18, 2024 16:37

This comment was marked as resolved.

Sign in to view

ezekiel-alexrod force-pushed the bugfix/conflict-409-replace-object branch from 6380974 to 76c41e7 Compare April 18, 2024 16:42

This comment was marked as resolved.

Sign in to view

TeddyAndrieux reviewed Apr 19, 2024

View reviewed changes

salt/_states/metalk8s_kubernetes.py Show resolved Hide resolved

salt,tests: Handle a 409 conflict error when using `metalk8s_kubernet…

4887e62

…es.object_present`

ezekiel-alexrod force-pushed the bugfix/conflict-409-replace-object branch from 76c41e7 to 4887e62 Compare April 19, 2024 09:12

This comment was marked as resolved.

Sign in to view

TeddyAndrieux approved these changes Apr 19, 2024

View reviewed changes

bert-e merged commit 4887e62 into development/127.0 Apr 19, 2024
27 checks passed

bert-e deleted the bugfix/conflict-409-replace-object branch April 19, 2024 12:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

salt,tests: Handle a 409 conflict error when using `metalk8s_kubernetes.object_present` #4317

salt,tests: Handle a 409 conflict error when using `metalk8s_kubernetes.object_present` #4317

ezekiel-alexrod commented Apr 18, 2024

bert-e commented Apr 18, 2024

bert-e commented Apr 18, 2024

ezekiel-alexrod commented Apr 18, 2024

bert-e commented Apr 18, 2024

bert-e commented Apr 18, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

bert-e commented Apr 18, 2024

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

bert-e commented Apr 19, 2024

bert-e commented Apr 19, 2024

TeddyAndrieux left a comment

ezekiel-alexrod commented Apr 19, 2024

bert-e commented Apr 19, 2024

salt,tests: Handle a 409 conflict error when using metalk8s_kubernetes.object_present #4317

salt,tests: Handle a 409 conflict error when using metalk8s_kubernetes.object_present #4317

Conversation

ezekiel-alexrod commented Apr 18, 2024

bert-e commented Apr 18, 2024

Hello ezekiel-alexrod,

bert-e commented Apr 18, 2024

Request integration branches

ezekiel-alexrod commented Apr 18, 2024

bert-e commented Apr 18, 2024

Integration data created

bert-e commented Apr 18, 2024

Waiting for approval

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

bert-e commented Apr 18, 2024

Waiting for approval

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

This comment was marked as resolved.

bert-e commented Apr 19, 2024

Waiting for approval

bert-e commented Apr 19, 2024

Waiting for approval

TeddyAndrieux left a comment

Choose a reason for hiding this comment

ezekiel-alexrod commented Apr 19, 2024

bert-e commented Apr 19, 2024

salt,tests: Handle a 409 conflict error when using `metalk8s_kubernetes.object_present` #4317

salt,tests: Handle a 409 conflict error when using `metalk8s_kubernetes.object_present` #4317