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

SDN-4952:Add new parameter namespaces-for-inter-network-service-access #2604

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bindata/network/ovn-kubernetes/managed/004-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ data:
lflow-cache-limit-kb=1048576
enable-udp-aggregation={{.EnableUDPAggregation}}
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="{{.OVN_service_cidr}}"
Expand Down Expand Up @@ -110,6 +111,7 @@ data:
enable-lflow-cache=true
lflow-cache-limit-kb=1048576
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="{{.OVN_service_cidr}}"
Expand Down
11 changes: 6 additions & 5 deletions bindata/network/ovn-kubernetes/self-hosted/004-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ data:
lflow-cache-limit-kb=1048576
enable-udp-aggregation={{.EnableUDPAggregation}}
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="{{.OVN_service_cidr}}"
Expand All @@ -34,7 +35,7 @@ data:
healthz-bind-address="0.0.0.0:10256"
dns-service-namespace="openshift-dns"
dns-service-name="dns-default"

[ovnkubernetesfeature]
enable-egress-ip=true
enable-egress-firewall=true
Expand Down Expand Up @@ -89,10 +90,10 @@ data:
{{- if .IsSNO }}

[clustermgrha]
{{- /*
Even in case of SNO there will be only one ovn-master, we set dedicated values for leader election
durations in SNO, as disabling it can cause issues on scaling out SNO again.
The whole discussion can be found at https://coreos.slack.com/archives/CDCP2LA9L/p1627402405090600.
{{- /*
Even in case of SNO there will be only one ovn-master, we set dedicated values for leader election
durations in SNO, as disabling it can cause issues on scaling out SNO again.
The whole discussion can be found at https://coreos.slack.com/archives/CDCP2LA9L/p1627402405090600.
Recommended values at https://github.com/openshift/enhancements/blame/84e894ead7b188a1013556e0ba6973b8463995f1/CONVENTIONS.md#L183
*/}}
election-lease-duration=137
Expand Down
13 changes: 13 additions & 0 deletions pkg/network/ovn_kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -322,6 +323,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -378,6 +380,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -437,6 +440,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -496,6 +500,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -554,6 +559,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -602,6 +608,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -652,6 +659,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=false
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -695,6 +703,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -738,6 +747,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -785,6 +795,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -829,6 +840,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down Expand Up @@ -874,6 +886,7 @@ enable-lflow-cache=true
lflow-cache-limit-kb=1048576
enable-udp-aggregation=true
udn-allowed-default-services="default/kubernetes,openshift-dns/dns-default"
namespaces-for-inter-network-service-access="openshift-ingress"

[kubernetes]
service-cidrs="172.30.0.0/16"
Expand Down