netpol: allowedIngressPorts and interNamespaceAccessLabels config added with defaults retaining 0.9.1 current behavior #1842
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| {{- $HTTPS := .Values.proxy.https.enabled -}} | ||
| {{- $autoHTTPS := and $HTTPS (and (eq .Values.proxy.https.type "letsencrypt") .Values.proxy.https.hosts) -}} | ||
| {{- if and $autoHTTPS .Values.proxy.traefik.networkPolicy.enabled -}} | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: NetworkPolicy | ||
| metadata: | ||
| name: autohttps | ||
| labels: | ||
| {{- include "jupyterhub.labels" . | nindent 4 }} | ||
| spec: | ||
| podSelector: | ||
| matchLabels: | ||
| {{- include "jupyterhub.matchLabels" . | nindent 6 }} | ||
| policyTypes: | ||
| - Ingress | ||
| - Egress | ||
|
|
||
| # IMPORTANT: | ||
|
There was a problem hiding this comment. Is there anything we can do to avoid duplication of this comment in multiple places, to prevent them inadvertently getting out of sync? There was a problem hiding this comment. Duplicating them breaks the DRY principle, but it also ensures this information is made available to everyone working with the resource which I felt was the most important part. NetworkPolicy resources are sooooooo hard to get right, and our tests doesn't test all our rules etc. There was a problem hiding this comment. I updated all comments to reflect your suggestions in the hub/netpol.yaml file |
||
| # NetworkPolicy's ingress "from" and egress "to" rule specifications require | ||
| # great attention to detail. A quick summary is: | ||
| # | ||
| # 1. You can provide "from"/"to" rules that provide access either ports or a | ||
| # subset of ports. | ||
| # 2. You can for each "from"/"to" rule provide any number of | ||
| # "sources"/"destinations" of four different kinds. | ||
| # - podSelector - targets pods with a certain label in the same namespace as the NetworkPolicy | ||
| # - namespaceSelector - targets all pods running in namespaces with a certain label | ||
| # - namespaceSelector and podSelector - targets pods with a certain label running in namespaces with a certain label | ||
| # - ipBlock - targets network traffic from/to a set of IP address ranges | ||
| # | ||
| # Read more at: https://kubernetes.io/docs/concepts/services-networking/network-policies/#behavior-of-to-and-from-selectors | ||
| # | ||
| ingress: | ||
| {{- with .Values.proxy.traefik.networkPolicy.allowedIngressPorts }} | ||
| # allow incoming traffic to these ports independent of source | ||
| - ports: | ||
| {{- range $port := . }} | ||
| - port: {{ $port }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| # allowed pods (hub.jupyter.org/network-access-proxy-http) --> proxy (http/https port) | ||
| - ports: | ||
| - port: http | ||
| - port: https | ||
| from: | ||
| # source 1 - labeled pods | ||
| - podSelector: | ||
| matchLabels: | ||
| hub.jupyter.org/network-access-proxy-http: "true" | ||
| {{- if eq .Values.proxy.traefik.networkPolicy.interNamespaceAccessLabels "accept" }} | ||
| namespaceSelector: | ||
| matchLabels: {} # without this, the podSelector would only consider pods in the local namespace | ||
| # source 2 - pods in labeled namespaces | ||
| - namespaceSelector: | ||
| matchLabels: | ||
| hub.jupyter.org/network-access-proxy-http: "true" | ||
| {{- end }} | ||
|
|
||
| {{- with .Values.proxy.traefik.networkPolicy.ingress}} | ||
| # depends, but default is nothing --> proxy | ||
| {{- . | toYaml | trimSuffix "\n" | nindent 4 }} | ||
| {{- end }} | ||
|
|
||
| egress: | ||
| # autohttps --> proxy (http port) | ||
| - ports: | ||
| - port: 8000 | ||
| to: | ||
| - podSelector: | ||
| matchLabels: | ||
| {{- $_ := merge (dict "componentLabel" "proxy") . }} | ||
| {{- include "jupyterhub.matchLabels" $_ | nindent 14 }} | ||
|
|
||
| # autohttps --> Kubernetes internal DNS | ||
| - ports: | ||
| - protocol: UDP | ||
| port: 53 | ||
| - protocol: TCP | ||
| port: 53 | ||
|
|
||
| {{- with .Values.proxy.traefik.networkPolicy.egress }} | ||
| # autohttps --> depends, but the default is everything | ||
| {{- . | toYaml | trimSuffix "\n" | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is my only concern here. I don't love it because it seems to be baking too much of the implementation into the configuration. When we finally manage to land the traefik proxy implementation (#1162), this configuration structure will change again when nothing relevant to users should really need to. What do users need to know about the separation of autohttps and chp that we couldn't represent without separating them?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We will still have a dedicated proxy for TLS termination i think, given that traefik doesnt support HA with lets encrypt.
This helm chart has a separate pod for TLS termination atm, and combining the config of two pods into one has caused it to be confusion in general. I'm think im for doing this even if it was a standalone refactoring without any other purpose to reduce that confusion.
If you feel strongly about it, i can revert it back, locating chp netpol config under proxy.netpol again.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To me, this change seems like it would increase confusion to have two network policies applying to what users should see as one resource (and indeed will be one resource if we manage to land the traefik proxy). I am thinking of the example of
Or is that not an accurate description of the behavior here?