diff --git a/jupyterhub/templates/NOTES.txt b/jupyterhub/templates/NOTES.txt index e9a4edfcd4..518ef50de3 100644 --- a/jupyterhub/templates/NOTES.txt +++ b/jupyterhub/templates/NOTES.txt @@ -92,7 +92,7 @@ {{- /* - Warnings for likely misconfiguration + Warnings for likely misconfigurations */}} {{- if and (not .Values.scheduling.podPriority.enabled) (and .Values.scheduling.userPlaceholder.enabled .Values.scheduling.userPlaceholder.replicas) }} @@ -114,7 +114,7 @@ {{- /* - Breaking changes. + Breaking changes and failures for likely misconfigurations. */}} {{- $breaking := "" }} @@ -148,6 +148,11 @@ {{- end }} +{{- if and .Values.singleuser.cloudMetadata.blockWithIptables (and .Values.singleuser.networkPolicy.enabled .Values.singleuser.networkPolicy.egressAllowRules.cloudMetadataServer) }} +{{- $breaking = print $breaking "\n\nCHANGED: singleuser.cloudMetadata.blockWithIptables must as of version 3.0.0 not be configured together with singleuser.networkPolicy.egressAllowRules.cloudMetadataServer as it leads to an ambiguous configuration." }} +{{- end }} + + {{- if $breaking }} {{- fail (print $breaking_title $breaking "\n\n") }} {{- end }} diff --git a/tools/templates/lint-and-validate-values.yaml b/tools/templates/lint-and-validate-values.yaml index 811d5ec818..0db90333c7 100644 --- a/tools/templates/lint-and-validate-values.yaml +++ b/tools/templates/lint-and-validate-values.yaml @@ -404,7 +404,7 @@ singleuser: networkPolicy: enabled: true egressAllowRules: - cloudMetadataServer: true + cloudMetadataServer: false dnsPortsPrivateIPs: true nonPrivateIPs: false privateIPs: false