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

Check if pod/svc and node CIDRs overlap #4217

Merged
merged 3 commits into from
Jan 5, 2024

Conversation

eg-ayoub
Copy link
Contributor

No description provided.

@eg-ayoub eg-ayoub requested a review from a team as a code owner December 28, 2023 10:00
@bert-e
Copy link
Contributor

bert-e commented Dec 28, 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 Dec 28, 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.

@eg-ayoub eg-ayoub force-pushed the improvement/check-conflicting-cidrs branch 3 times, most recently from 1d34373 to 42d5e40 Compare December 29, 2023 09:33
@eg-ayoub eg-ayoub force-pushed the improvement/check-conflicting-cidrs branch 6 times, most recently from 8a14a36 to d78ca81 Compare January 3, 2024 15:32
salt/_modules/metalk8s_checks.py Outdated Show resolved Hide resolved
salt/_modules/metalk8s_checks.py Outdated Show resolved Hide resolved
salt/_modules/metalk8s_checks.py Show resolved Hide resolved
salt/tests/unit/modules/files/test_metalk8s_checks.yaml Outdated Show resolved Hide resolved
@eg-ayoub eg-ayoub force-pushed the improvement/check-conflicting-cidrs branch from d78ca81 to a7441bb Compare January 3, 2024 17:37
@eg-ayoub eg-ayoub force-pushed the improvement/check-conflicting-cidrs branch from a7441bb to f5595bd Compare January 4, 2024 11:00
@eg-ayoub
Copy link
Contributor Author

eg-ayoub commented Jan 4, 2024

/approve

@bert-e
Copy link
Contributor

bert-e commented Jan 4, 2024

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/125.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: approve

@bert-e
Copy link
Contributor

bert-e commented Jan 4, 2024

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

  • ✔️ development/127.0

The following branches will NOT be impacted:

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

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 Jan 5, 2024

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

  • ✔️ development/126.0

  • ✔️ development/127.0

The following branches have NOT changed:

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

Goodbye eg-ayoub.

@bert-e bert-e merged commit 84a2d92 into development/126.0 Jan 5, 2024
26 checks passed
@bert-e bert-e deleted the improvement/check-conflicting-cidrs branch January 5, 2024 16:43
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