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

salt: Support 127.0.0.1 hostPort #3396

Merged
merged 1 commit into from
May 26, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'salt'

Context:

Support 127.0.0.1 as hostPort

Summary:

Before this commit we only support hostPort on workloadPlane IP, this
commit also add 127.0.0.1 as supported hostPort

NOTE: It's needed for Kubernetes conformance tests for Kubernetes 1.20+


@TeddyAndrieux TeddyAndrieux added topic:networking Networking-related issues topic:deployment Bugs in or enhancements to deployment stages complexity:easy Something that requires less than a day to fix labels May 26, 2021
@TeddyAndrieux TeddyAndrieux requested a review from a team May 26, 2021 08:28
@bert-e
Copy link
Contributor

bert-e commented May 26, 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 May 26, 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

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 May 26, 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:

Before this commit we only support hostPort on workloadPlane IP, this
commit also add `127.0.0.1` as supported hostPort

NOTE: It's needed for Kubernetes conformance tests for Kubernetes 1.20+
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/allow-hostport-on-localhost branch from ee5ee2a to 91b4dc1 Compare May 26, 2021 08:29
@bert-e
Copy link
Contributor

bert-e commented May 26, 2021

History mismatch

Merge commit #ee5ee2a3b98f668eeb3574e214ae383e638dada1 on the integration branch
w/2.10/improvement/allow-hostport-on-localhost is merging a branch which is neither the current
branch improvement/allow-hostport-on-localhost nor the development branch
development/2.10.

It is likely due to a rebase of the branch improvement/allow-hostport-on-localhost 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

/reset

@bert-e
Copy link
Contributor

bert-e commented May 26, 2021

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented May 26, 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

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 May 26, 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:

@@ -63,7 +63,7 @@ Create CNI calico configuration file:
snat: true
capabilities:
portMappings: true
conditionsV4: ["-d", "{{ grains.metalk8s.workload_plane_ip }}/32"]
conditionsV4: ["-d", "{{ grains.metalk8s.workload_plane_ip }}/32,127.0.0.1/32"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't it be on the whole 127.0.0.0/8 network ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hmmm I'm not sure, to me here we only want localhost and not any other "loopback" addresses used for .... whatelse
I think but not sure

Copy link
Contributor

Choose a reason for hiding this comment

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

IIUC, what we want is "all host-local addresses except control plane", no?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

To me, we want workload plane IP and that's it (just we add 127.0.0.1 as it's needed for conformance tests and does not hurt anyway)

Copy link
Contributor

@alexandre-allard alexandre-allard May 26, 2021

Choose a reason for hiding this comment

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

I don't really know what we should do either and I'm not even sure that's really important.
We can merge your changes as that's only what's requested by the K8s conformance tests.
But I don't see any valid reason to restrict to only 127.0.0.1/32 instead of 127.0.0.0/8

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Agree 👍,
Maybe we will want to make it configurable at some point also, but for the moment let's not bother about it 😃

Copy link
Contributor

Choose a reason for hiding this comment

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

Likely, yes.

Copy link
Contributor

Choose a reason for hiding this comment

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

Though, maybe the current change is sufficient. It passes conformance, so it's supposed to be conformant. I'm not sure where it's said a K8s cluster must expose NodePorts on 127.0.0.0/8. If this is the case, maybe we should widen things up further.

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 26, 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.9

  • ✔️ development/2.10

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

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 May 26, 2021

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

  • ✔️ development/2.9

  • ✔️ development/2.10

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

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 6f71984 into development/2.9 May 26, 2021
@bert-e bert-e deleted the improvement/allow-hostport-on-localhost branch May 26, 2021 11:13
@NicolasT
Copy link
Contributor

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 topic:networking Networking-related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants