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

charts,salt: Allow to set Control Plane Ingress IP to an external IP #3752

Merged

Conversation

TeddyAndrieux
Copy link
Collaborator

In some context, the IP used to reach the Control Plane Ingress (MetalK8s
UI) is not an IP available on the node, it could be a Load balancer IP
or a NATed IP, so we need to be able to configure OIDC with that kind of
IP

That's why we now use the Control Plane Ingress IP defined in the
bootstrap config and all master Control Plane node IP as externalIPs
for the Control Plane Ingress service, so that we can reach the Control
Plane Ingress with any of those IPs (but only the Control Plane Ingress
Ip will be used as redirect IP for OIDC)

In some context the IP used to reach the Control Plane Ingress (MetalK8s
UI) is not an IP available on the node, it could be a Load balancer IP
or a NATed IP, so we need to be able to configure OIDC with that kind of
IP

That's why we now use the Control Plane Ingress IP defined in the
bootstrap config and all master Control Plane node IP as `externalIPs`
for the Control Plane Ingress service, so that we can reach the Control
Plane Ingress with any of those IPs (but only the Control Plane Ingress
Ip will be used as redirect IP for OIDC)

Re-render the Control Plane Ingress DaemonSet chart salt state using:
```
./charts/render.py ingress-nginx-control-plane --namespace metalk8s-ingress \
  charts/ingress-nginx-control-plane-daemonset.yaml charts/ingress-nginx/ \
  > salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart-daemonset.sls
```
@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner April 26, 2022 06:45
@bert-e
Copy link
Contributor

bert-e commented Apr 26, 2022

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 Apr 26, 2022

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.10
  • 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 Apr 26, 2022

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

/reset

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

Conflict

A conflict has been raised during the creation of
integration branch w/123.0/improvement/allow-expose-cp-ingress-on-external-ip with contents from improvement/allow-expose-cp-ingress-on-external-ip
and development/123.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/123.0/improvement/allow-expose-cp-ingress-on-external-ip origin/development/123.0
 $ git merge origin/improvement/allow-expose-cp-ingress-on-external-ip
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/123.0/improvement/allow-expose-cp-ingress-on-external-ip

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

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:

)

return [__salt__["metalk8s_network.get_control_plane_ingress_ip"]()] + sorted(
list(mine_ret.values())
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI: no need to cast this into a list, sorted can take any iterable

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oh right, I added the sorted at the end and you cannot concat list and dict values that's why 😄
I will merge it as is to not wait another couple of builds

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 6, 2022

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

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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 May 6, 2022

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

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • 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 0fd32c7 into development/2.11 May 6, 2022
@bert-e bert-e deleted the improvement/allow-expose-cp-ingress-on-external-ip branch May 6, 2022 11:06
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