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

Remove nodes-darwin dashboard from kube-prometheus-stack #4178

Merged
merged 3 commits into from
Oct 12, 2023

Conversation

eg-ayoub
Copy link
Contributor

@eg-ayoub eg-ayoub commented Oct 9, 2023

No description provided.

@eg-ayoub eg-ayoub requested a review from a team as a code owner October 9, 2023 16:20
@bert-e
Copy link
Contributor

bert-e commented Oct 9, 2023

Hello eg-ayoub,

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 9, 2023

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.

TeddyAndrieux
TeddyAndrieux previously approved these changes Oct 9, 2023
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@TeddyAndrieux TeddyAndrieux force-pushed the bugfix/remove-nodes-darwin-dashboard branch 5 times, most recently from ffc84e2 to ad6a922 Compare October 10, 2023 11:07
@eg-ayoub
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 10, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/126.0/bugfix/remove-nodes-darwin-dashboard with contents from bugfix/remove-nodes-darwin-dashboard
and development/126.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/126.0/bugfix/remove-nodes-darwin-dashboard origin/development/126.0
 $ git merge origin/bugfix/remove-nodes-darwin-dashboard
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/126.0/bugfix/remove-nodes-darwin-dashboard

The following options are set: create_integration_branches

eg-ayoub and others added 3 commits October 11, 2023 15:31
Since few days setup-envtest does no longer works with Go prior to 1.19,
so let's use a specific git commit hash to install setup-envtest (since
there is no tags on this module)

Sees: kubernetes-sigs/controller-runtime#2537
@eg-ayoub eg-ayoub force-pushed the bugfix/remove-nodes-darwin-dashboard branch from ad6a922 to b710792 Compare October 11, 2023 13:32
@eg-ayoub
Copy link
Contributor Author

ping

1 similar comment
@eg-ayoub
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2023

Conflict

A conflict has been raised during the creation of
integration branch w/127.0/bugfix/remove-nodes-darwin-dashboard with contents from w/126.0/bugfix/remove-nodes-darwin-dashboard
and development/127.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/127.0/bugfix/remove-nodes-darwin-dashboard origin/development/127.0
 $ git merge origin/w/126.0/bugfix/remove-nodes-darwin-dashboard
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/127.0/bugfix/remove-nodes-darwin-dashboard

The following options are set: create_integration_branches

@eg-ayoub
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2023

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

@eg-ayoub
Copy link
Contributor Author

/create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2023

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • 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

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2023

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_pull_requests, create_integration_branches

@eg-ayoub
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2023

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, create_pull_requests, create_integration_branches

@eg-ayoub
Copy link
Contributor Author

ping

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2023

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/125.0

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • 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

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, create_pull_requests, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2023

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

  • ✔️ development/125.0

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • 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 None.

Goodbye eg-ayoub.

@eg-ayoub eg-ayoub merged commit b710792 into development/125.0 Oct 12, 2023
33 of 40 checks passed
@eg-ayoub eg-ayoub deleted the bugfix/remove-nodes-darwin-dashboard branch October 12, 2023 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants