Skip to content

Commit a72a98e

Browse files
kyrtapzkyrtapz
committed
Merge branch 'pr/5561' into ds_5561
2 parents a7a531f + 914c955 commit a72a98e

File tree

151 files changed

+4997
-1626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+4997
-1626
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ Here are some links to help in your ovn-kubernetes journey:
3535

3636
- [Welcome to ovn-kubernetes](https://ovn-kubernetes.io/) for overview of ovn-kubernetes.
3737
- [Architecture of ovn-kubernetes](https://ovn-kubernetes.io/design/architecture/)
38-
- [Deploying OVN Kubernetes cluster using KIND](https://ovn-kubernetes.io/installation/launching-ovn-kubernetes-on-kind/)
39-
- [Deploying OVN Kubernetes CNI using Helm](https://ovn-kubernetes.io/installation/launching-ovn-kubernetes-with-helm/)
40-
- [Contributing to OVN Kubernetes](https://ovn-kubernetes.io/governance/CONTRIBUTING/) for how to get involved
38+
- [Deploying OVN-Kubernetes cluster using KIND](https://ovn-kubernetes.io/installation/launching-ovn-kubernetes-on-kind/)
39+
- [Deploying OVN-Kubernetes CNI using Helm](https://ovn-kubernetes.io/installation/launching-ovn-kubernetes-with-helm/)
40+
- [Contributing to OVN-Kubernetes](https://ovn-kubernetes.io/governance/CONTRIBUTING/) for how to get involved
4141
in our project
4242
- [Meet the Community](https://ovn-kubernetes.io/governance/MEETINGS/) for details on community
4343
meeting details.

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Security Policy
22

3-
OVNKubernetes repo uses the [dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates) which does automatic security updates by scanning the repo and opening PRs to update the effected libraries.
3+
OVN-Kubernetes repo uses the [dependabot](https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates) which does automatic security updates by scanning the repo and opening PRs to update the effected libraries.
44

55
## Reporting a Vulnerability
66

‎contrib/kind-helm.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ set_default_params() {
5252
export SVC_CIDR_IPV6=${SVC_CIDR_IPV6:-fd00:10:96::/112}
5353
export JOIN_SUBNET_IPV4=${JOIN_SUBNET_IPV4:-100.64.0.0/16}
5454
export JOIN_SUBNET_IPV6=${JOIN_SUBNET_IPV6:-fd98::/64}
55-
export TRANSIT_SWITCH_SUBNET_IPV4=${TRANSIT_SWITCH_SUBNET_IPV4:-100.88.0.0/16}
56-
export TRANSIT_SWITCH_SUBNET_IPV6=${TRANSIT_SWITCH_SUBNET_IPV6:-fd97::/64}
55+
export TRANSIT_SUBNET_IPV4=${TRANSIT_SUBNET_IPV4:-100.88.0.0/16}
56+
export TRANSIT_SUBNET_IPV6=${TRANSIT_SUBNET_IPV6:-fd97::/64}
5757
export METALLB_CLIENT_NET_SUBNET_IPV4=${METALLB_CLIENT_NET_SUBNET_IPV4:-172.22.0.0/16}
5858
export METALLB_CLIENT_NET_SUBNET_IPV6=${METALLB_CLIENT_NET_SUBNET_IPV6:-fc00:f853:ccd:e792::/64}
5959

‎contrib/kind.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ echo "-npz | --nodes-per-zone If interconnect is enabled,
121121
echo "-mtu Define the overlay mtu"
122122
echo "--isolated Deploy with an isolated environment (no default gateway)"
123123
echo "--delete Delete current cluster"
124-
echo "--deploy Deploy ovn kubernetes without restarting kind"
124+
echo "--deploy Deploy ovn-kubernetes without restarting kind"
125125
echo "--add-nodes Adds nodes to an existing cluster. The number of nodes to be added is specified by --num-workers. Also use -ic if the cluster is using interconnect."
126126
echo "-dns | --enable-dnsnameresolver Enable DNSNameResolver for resolving the DNS names used in the DNS rules of EgressFirewall."
127127
echo "-obs | --observability Enable OVN Observability feature."
@@ -593,8 +593,8 @@ set_default_params() {
593593
JOIN_SUBNET_IPV6=${JOIN_SUBNET_IPV6:-fd98::/64}
594594
MASQUERADE_SUBNET_IPV4=${MASQUERADE_SUBNET_IPV4:-169.254.0.0/17}
595595
MASQUERADE_SUBNET_IPV6=${MASQUERADE_SUBNET_IPV6:-fd69::/112}
596-
TRANSIT_SWITCH_SUBNET_IPV4=${TRANSIT_SWITCH_SUBNET_IPV4:-100.88.0.0/16}
597-
TRANSIT_SWITCH_SUBNET_IPV6=${TRANSIT_SWITCH_SUBNET_IPV6:-fd97::/64}
596+
TRANSIT_SUBNET_IPV4=${TRANSIT_SUBNET_IPV4:-100.88.0.0/16}
597+
TRANSIT_SUBNET_IPV6=${TRANSIT_SUBNET_IPV6:-fd97::/64}
598598
METALLB_CLIENT_NET_SUBNET_IPV4=${METALLB_CLIENT_NET_SUBNET_IPV4:-172.22.0.0/16}
599599
METALLB_CLIENT_NET_SUBNET_IPV6=${METALLB_CLIENT_NET_SUBNET_IPV6:-fc00:f853:ccd:e792::/64}
600600
BGP_SERVER_NET_SUBNET_IPV4=${BGP_SERVER_NET_SUBNET_IPV4:-172.26.0.0/16}
@@ -631,7 +631,7 @@ set_default_params() {
631631
OVN_HOST_NETWORK_NAMESPACE=${OVN_HOST_NETWORK_NAMESPACE:-ovn-host-network}
632632
OVN_EGRESSIP_HEALTHCHECK_PORT=${OVN_EGRESSIP_HEALTHCHECK_PORT:-9107}
633633
OCI_BIN=${KIND_EXPERIMENTAL_PROVIDER:-docker}
634-
OVN_DEPLOY_PODS=${OVN_DEPLOY_PODS:-"ovnkube-zone-controller ovnkube-control-plane ovnkube-master ovnkube-node"}
634+
OVN_DEPLOY_PODS=${OVN_DEPLOY_PODS:-"ovnkube-identity ovnkube-zone-controller ovnkube-control-plane ovnkube-master ovnkube-node"}
635635
OVN_METRICS_SCALE_ENABLE=${OVN_METRICS_SCALE_ENABLE:-false}
636636
OVN_ISOLATED=${OVN_ISOLATED:-false}
637637
OVN_GATEWAY_OPTS=${OVN_GATEWAY_OPTS:-""}
@@ -914,8 +914,8 @@ create_ovn_kube_manifests() {
914914
--v6-join-subnet="${JOIN_SUBNET_IPV6}" \
915915
--v4-masquerade-subnet="${MASQUERADE_SUBNET_IPV4}" \
916916
--v6-masquerade-subnet="${MASQUERADE_SUBNET_IPV6}" \
917-
--v4-transit-switch-subnet="${TRANSIT_SWITCH_SUBNET_IPV4}" \
918-
--v6-transit-switch-subnet="${TRANSIT_SWITCH_SUBNET_IPV6}" \
917+
--v4-transit-subnet="${TRANSIT_SUBNET_IPV4}" \
918+
--v6-transit-subnet="${TRANSIT_SUBNET_IPV6}" \
919919
--ex-gw-network-interface="${OVN_EX_GW_NETWORK_INTERFACE}" \
920920
--multi-network-enable="${ENABLE_MULTI_NET}" \
921921
--network-segmentation-enable="${ENABLE_NETWORK_SEGMENTATION}" \

‎dist/images/daemonset.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ OVN_V4_JOIN_SUBNET=""
7979
OVN_V6_JOIN_SUBNET=""
8080
OVN_V4_MASQUERADE_SUBNET=""
8181
OVN_V6_MASQUERADE_SUBNET=""
82-
OVN_V4_TRANSIT_SWITCH_SUBNET=""
83-
OVN_V6_TRANSIT_SWITCH_SUBNET=""
82+
OVN_V4_TRANSIT_SUBNET=""
83+
OVN_V6_TRANSIT_SUBNET=""
8484
OVN_NETFLOW_TARGETS=""
8585
OVN_SFLOW_TARGETS=""
8686
OVN_IPFIX_TARGETS=""
@@ -302,11 +302,11 @@ while [ "$1" != "" ]; do
302302
--v6-masquerade-subnet)
303303
OVN_V6_MASQUERADE_SUBNET=$VALUE
304304
;;
305-
--v4-transit-switch-subnet)
306-
OVN_V4_TRANSIT_SWITCH_SUBNET=$VALUE
305+
--v4-transit-subnet)
306+
OVN_V4_TRANSIT_SUBNET=$VALUE
307307
;;
308-
--v6-transit-switch-subnet)
309-
OVN_V6_TRANSIT_SWITCH_SUBNET=$VALUE
308+
--v6-transit-subnet)
309+
OVN_V6_TRANSIT_SUBNET=$VALUE
310310
;;
311311
--netflow-targets)
312312
OVN_NETFLOW_TARGETS=$VALUE
@@ -536,10 +536,10 @@ ovn_v4_masquerade_subnet=${OVN_V4_MASQUERADE_SUBNET}
536536
echo "ovn_v4_masquerade_subnet: ${ovn_v4_masquerade_subnet}"
537537
ovn_v6_masquerade_subnet=${OVN_V6_MASQUERADE_SUBNET}
538538
echo "ovn_v6_masquerade_subnet: ${ovn_v6_masquerade_subnet}"
539-
ovn_v4_transit_switch_subnet=${OVN_V4_TRANSIT_SWITCH_SUBNET}
540-
echo "ovn_v4_transit_switch_subnet: ${ovn_v4_transit_switch_subnet}"
541-
ovn_v6_transit_switch_subnet=${OVN_V6_TRANSIT_SWITCH_SUBNET}
542-
echo "ovn_v6_transit_switch_subnet: ${ovn_v6_transit_switch_subnet}"
539+
ovn_v4_transit_subnet=${OVN_V4_TRANSIT_SUBNET}
540+
echo "ovn_v4_transit_subnet: ${ovn_v4_transit_subnet}"
541+
ovn_v6_transit_subnet=${OVN_V6_TRANSIT_SUBNET}
542+
echo "ovn_v6_transit_subnet: ${ovn_v6_transit_subnet}"
543543
ovn_netflow_targets=${OVN_NETFLOW_TARGETS}
544544
echo "ovn_netflow_targets: ${ovn_netflow_targets}"
545545
ovn_sflow_targets=${OVN_SFLOW_TARGETS}
@@ -842,8 +842,8 @@ ovn_image=${ovnkube_image} \
842842
ovn_enable_multi_external_gateway=${ovn_enable_multi_external_gateway} \
843843
ovn_enable_ovnkube_identity=${ovn_enable_ovnkube_identity} \
844844
ovn_network_qos_enable=${ovn_network_qos_enable} \
845-
ovn_v4_transit_switch_subnet=${ovn_v4_transit_switch_subnet} \
846-
ovn_v6_transit_switch_subnet=${ovn_v6_transit_switch_subnet} \
845+
ovn_v4_transit_subnet=${ovn_v4_transit_subnet} \
846+
ovn_v6_transit_subnet=${ovn_v6_transit_subnet} \
847847
ovn_enable_persistent_ips=${ovn_enable_persistent_ips} \
848848
ovn_enable_dnsnameresolver=${ovn_enable_dnsnameresolver} \
849849
ovn_observ_enable=${ovn_observ_enable} \

‎dist/images/ovnkube.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ ovn_v6_join_subnet=${OVN_V6_JOIN_SUBNET:-}
238238
ovn_v4_masquerade_subnet=${OVN_V4_MASQUERADE_SUBNET:-}
239239
# OVN_V6_MASQUERADE_SUBNET - v6 masquerade subnet
240240
ovn_v6_masquerade_subnet=${OVN_V6_MASQUERADE_SUBNET:-}
241-
# OVN_V4_TRANSIT_SWITCH_SUBNET - v4 Transit switch subnet
242-
ovn_v4_transit_switch_subnet=${OVN_V4_TRANSIT_SWITCH_SUBNET:-}
243-
# OVN_V6_TRANSIT_SWITCH_SUBNET - v6 Transit switch subnet
244-
ovn_v6_transit_switch_subnet=${OVN_V6_TRANSIT_SWITCH_SUBNET:-}
241+
# OVN_V4_TRANSIT_SUBNET - v4 Transit subnet
242+
ovn_v4_transit_subnet=${OVN_V4_TRANSIT_SUBNET:-}
243+
# OVN_V6_TRANSIT_SUBNET - v6 Transit subnet
244+
ovn_v6_transit_subnet=${OVN_V6_TRANSIT_SUBNET:-}
245245
#OVN_REMOTE_PROBE_INTERVAL - ovn remote probe interval in ms (default 100000)
246246
ovn_remote_probe_interval=${OVN_REMOTE_PROBE_INTERVAL:-100000}
247247
#OVN_MONITOR_ALL - ovn-controller monitor all data in SB DB
@@ -2356,17 +2356,17 @@ ovn-cluster-manager() {
23562356
fi
23572357
echo "ovn_v6_masquerade_subnet_opt=${ovn_v6_masquerade_subnet_opt}"
23582358

2359-
ovn_v4_transit_switch_subnet_opt=
2360-
if [[ -n ${ovn_v4_transit_switch_subnet} ]]; then
2361-
ovn_v4_transit_switch_subnet_opt="--cluster-manager-v4-transit-switch-subnet=${ovn_v4_transit_switch_subnet}"
2359+
ovn_v4_transit_subnet_opt=
2360+
if [[ -n ${ovn_v4_transit_subnet} ]]; then
2361+
ovn_v4_transit_subnet_opt="--cluster-manager-v4-transit-subnet=${ovn_v4_transit_subnet}"
23622362
fi
2363-
echo "ovn_v4_transit_switch_subnet_opt=${ovn_v4_transit_switch_subnet}"
2363+
echo "ovn_v4_transit_subnet_opt=${ovn_v4_transit_subnet}"
23642364

2365-
ovn_v6_transit_switch_subnet_opt=
2366-
if [[ -n ${ovn_v6_transit_switch_subnet} ]]; then
2367-
ovn_v6_transit_switch_subnet_opt="--cluster-manager-v6-transit-switch-subnet=${ovn_v6_transit_switch_subnet}"
2365+
ovn_v6_transit_subnet_opt=
2366+
if [[ -n ${ovn_v6_transit_subnet} ]]; then
2367+
ovn_v6_transit_subnet_opt="--cluster-manager-v6-transit-subnet=${ovn_v6_transit_subnet}"
23682368
fi
2369-
echo "ovn_v6_transit_switch_subnet_opt=${ovn_v6_transit_switch_subnet}"
2369+
echo "ovn_v6_transit_subnet_opt=${ovn_v6_transit_subnet}"
23702370

23712371
multicast_enabled_flag=
23722372
if [[ ${ovn_multicast_enable} == "true" ]]; then
@@ -2476,8 +2476,8 @@ ovn-cluster-manager() {
24762476
${ovn_v4_masquerade_subnet_opt} \
24772477
${ovn_v6_join_subnet_opt} \
24782478
${ovn_v6_masquerade_subnet_opt} \
2479-
${ovn_v4_transit_switch_subnet_opt} \
2480-
${ovn_v6_transit_switch_subnet_opt} \
2479+
${ovn_v4_transit_subnet_opt} \
2480+
${ovn_v6_transit_subnet_opt} \
24812481
${network_qos_enabled_flag} \
24822482
${ovn_enable_dnsnameresolver_flag} \
24832483
--gateway-mode=${ovn_gateway_mode} \

‎dist/templates/k8s.ovn.org_clusteruserdefinednetworks.yaml.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ spec:
145145
description: |-
146146
Lifecycle controls IP addresses management lifecycle.
147147

148-
The only allowed value is Persistent. When set, the IP addresses assigned by OVN Kubernetes will be persisted in an
148+
The only allowed value is Persistent. When set, the IP addresses assigned by OVN-Kubernetes will be persisted in an
149149
`ipamclaims.k8s.cni.cncf.io` object. These IP addresses will be reused by other pods if requested.
150150
Only supported when mode is `Enabled`.
151151
enum:
@@ -468,7 +468,7 @@ spec:
468468
description: |-
469469
Lifecycle controls IP addresses management lifecycle.
470470

471-
The only allowed value is Persistent. When set, the IP addresses assigned by OVN Kubernetes will be persisted in an
471+
The only allowed value is Persistent. When set, the IP addresses assigned by OVN-Kubernetes will be persisted in an
472472
`ipamclaims.k8s.cni.cncf.io` object. These IP addresses will be reused by other pods if requested.
473473
Only supported when mode is `Enabled`.
474474
enum:

‎dist/templates/k8s.ovn.org_userdefinednetworks.yaml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ spec:
9393
description: |-
9494
Lifecycle controls IP addresses management lifecycle.
9595

96-
The only allowed value is Persistent. When set, the IP addresses assigned by OVN Kubernetes will be persisted in an
96+
The only allowed value is Persistent. When set, the IP addresses assigned by OVN-Kubernetes will be persisted in an
9797
`ipamclaims.k8s.cni.cncf.io` object. These IP addresses will be reused by other pods if requested.
9898
Only supported when mode is `Enabled`.
9999
enum:

‎dist/templates/ovnkube-control-plane.yaml.j2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ spec:
179179
value: "{{ ovn_enable_interconnect }}"
180180
- name: OVN_ENABLE_MULTI_EXTERNAL_GATEWAY
181181
value: "{{ ovn_enable_multi_external_gateway }}"
182-
- name: OVN_V4_TRANSIT_SWITCH_SUBNET
183-
value: "{{ ovn_v4_transit_switch_subnet }}"
184-
- name: OVN_V6_TRANSIT_SWITCH_SUBNET
185-
value: "{{ ovn_v6_transit_switch_subnet }}"
182+
- name: OVN_V4_TRANSIT_SUBNET
183+
value: "{{ ovn_v4_transit_subnet }}"
184+
- name: OVN_V6_TRANSIT_SUBNET
185+
value: "{{ ovn_v6_transit_subnet }}"
186186
- name: OVN_ENABLE_PERSISTENT_IPS
187187
value: "{{ ovn_enable_persistent_ips }}"
188188
- name: OVN_NETWORK_QOS_ENABLE

‎docs/api-reference/userdefinednetwork-api-spec.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ _Appears in:_
153153
| Field | Description | Default | Validation |
154154
| --- | --- | --- | --- |
155155
| `mode` _[IPAMMode](#ipammode)_ | Mode controls how much of the IP configuration will be managed by OVN.<br />`Enabled` means OVN-Kubernetes will apply IP configuration to the SDN infrastructure and it will also assign IPs<br />from the selected subnet to the individual pods.<br />`Disabled` means OVN-Kubernetes will only assign MAC addresses and provide layer 2 communication, letting users<br />configure IP addresses for the pods.<br />`Disabled` is only available for Secondary networks.<br />By disabling IPAM, any Kubernetes features that rely on selecting pods by IP will no longer function<br />(such as network policy, services, etc). Additionally, IP port security will also be disabled for interfaces attached to this network.<br />Defaults to `Enabled`. | | Enum: [Enabled Disabled] <br /> |
156-
| `lifecycle` _[NetworkIPAMLifecycle](#networkipamlifecycle)_ | Lifecycle controls IP addresses management lifecycle.<br /><br />The only allowed value is Persistent. When set, the IP addresses assigned by OVN Kubernetes will be persisted in an<br />`ipamclaims.k8s.cni.cncf.io` object. These IP addresses will be reused by other pods if requested.<br />Only supported when mode is `Enabled`. | | Enum: [Persistent] <br /> |
156+
| `lifecycle` _[NetworkIPAMLifecycle](#networkipamlifecycle)_ | Lifecycle controls IP addresses management lifecycle.<br /><br />The only allowed value is Persistent. When set, the IP addresses assigned by OVN-Kubernetes will be persisted in an<br />`ipamclaims.k8s.cni.cncf.io` object. These IP addresses will be reused by other pods if requested.<br />Only supported when mode is `Enabled`. | | Enum: [Persistent] <br /> |
157157

158158

159159
#### IPAMMode

0 commit comments

Comments
 (0)