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.

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

build: Bump K8s version to 1.17.14 #2923

Merged
merged 1 commit into from
Nov 13, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'kubernetes'

Summary:

Bump Kubernetes version to 1.17.14

@TeddyAndrieux TeddyAndrieux added topic:deployment Bugs in or enhancements to deployment stages complexity:easy Something that requires less than a day to fix labels Nov 12, 2020
@TeddyAndrieux TeddyAndrieux added this to the MetalK8s 2.6.0 milestone Nov 12, 2020
@TeddyAndrieux TeddyAndrieux requested a review from a team November 12, 2020 09:39
@bert-e
Copy link
Contributor

bert-e commented Nov 12, 2020

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 Nov 12, 2020

Conflict

A conflict has been raised during the creation of
integration branch w/2.7/improvement/bump-k8s-11714 with contents from improvement/bump-k8s-11714
and development/2.7.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.7/improvement/bump-k8s-11714 origin/development/2.7
 $ git merge origin/improvement/bump-k8s-11714
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.7/improvement/bump-k8s-11714

@bert-e
Copy link
Contributor

bert-e commented Nov 12, 2020

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

TeddyAndrieux commented Nov 12, 2020

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 12, 2020

Unknown command

I didn't understand this comment by @TeddyAndrieux:

/approved

I don't know what approved means.

Please edit or delete the corresponding comment so I can move on.

@bert-e
Copy link
Contributor

bert-e commented Nov 12, 2020

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

bert-e commented Nov 13, 2020

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

  • ✔️ development/2.7

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
  • development/2.4
  • development/2.5

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 Nov 13, 2020

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

  • ✔️ development/2.6

  • ✔️ development/2.7

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
  • development/2.4
  • development/2.5

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 1f93f85 into development/2.6 Nov 13, 2020
@bert-e bert-e deleted the improvement/bump-k8s-11714 branch November 13, 2020 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix topic:deployment Bugs in or enhancements to deployment stages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants