Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

salt: Use generateName to create Job for backup replication #3590

Merged
merged 2 commits into from
Oct 29, 2021
Merged

salt: Use generateName to create Job for backup replication #3590

merged 2 commits into from
Oct 29, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

  • Fix a bug in salt Kubernetes state module to handle properly generateName
  • Use generateName for Job name for backup replication

@TeddyAndrieux TeddyAndrieux requested a review from a team October 29, 2021 07:46
@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

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
Copy link
Contributor

bert-e commented Oct 29, 2021

Integration data created

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

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • 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

@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

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:

@TeddyAndrieux
salt: Do not try to retrieve object if we use generateName
30851ed 
For some object (like Job) we want to generate unique Job name that's
why we use the `generateName` feature from Kubernetes
@TeddyAndrieux
salt: Use generateName feature from Kubernetes instead of random salt
14f942c 
Do no longer use salt to generate unique job name for backup
replication, instead rely on `generateName` feature from Kubernetes
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/change-backup-job-name branch from 834e4bc to 14f942c Compare October 29, 2021 07:47
@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

History mismatch

Merge commit #3875dfe4c127c979b07ce0b06064c892a4f03566 on the integration branch
w/2.11/improvement/change-backup-job-name is merging a branch which is neither the current
branch improvement/change-backup-job-name nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/change-backup-job-name 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
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

History mismatch

Merge commit #3875dfe4c127c979b07ce0b06064c892a4f03566 on the integration branch
w/2.11/improvement/change-backup-job-name is merging a branch which is neither the current
branch improvement/change-backup-job-name nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/change-backup-job-name 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
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

Reset complete

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

Integration data created

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

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • 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: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

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
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 29, 2021

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.10

  • ✔️ development/2.11

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

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
Copy link
Contributor

bert-e commented Oct 29, 2021

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

  • ✔️ development/2.10

  • ✔️ development/2.11

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • 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 None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 14f942c into development/2.10 Oct 29, 2021
@bert-e bert-e deleted the improvement/change-backup-job-name branch October 29, 2021 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JBWatenbergScality JBWatenbergScality JBWatenbergScality approved these changes

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TeddyAndrieux @bert-e @gdemonet @JBWatenbergScality