diff --git a/dist/images/install.sh b/dist/images/install.sh index 9f8a2b35c396..03a0fdd69746 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -40,9 +40,6 @@ OVS_VSCTL_CONCURRENCY=${OVS_VSCTL_CONCURRENCY:-100} ENABLE_COMPACT=${ENABLE_COMPACT:-false} SECURE_SERVING=${SECURE_SERVING:-false} -# ovn version -versionCompatibility=24.03 - # debug DEBUG_WRAPPER=${DEBUG_WRAPPER:-} @@ -3465,8 +3462,6 @@ spec: value: "1" - name: ENABLE_COMPACT value: "$ENABLE_COMPACT" - - name: OVN_VERSION_COMPATIBILITY - value: "$versionCompatibility" resources: requests: cpu: 300m diff --git a/dist/images/start-db.sh b/dist/images/start-db.sh index 579065ba50b9..aea83910f25a 100755 --- a/dist/images/start-db.sh +++ b/dist/images/start-db.sh @@ -149,9 +149,6 @@ function set_nb_version_compatibility() { if [ "$value" != "_$OVN_VERSION_COMPATIBILITY" ]; then ovn-nbctl --db=$(gen_conn_str 6641) $SSL_OPTIONS set NB_Global . options:version_compatibility=${OVN_VERSION_COMPATIBILITY} fi - else - echo "OVN_VERSION_COMPATIBILITY is not set" - return 1 fi } diff --git a/yamls/kind.yaml.j2 b/yamls/kind.yaml.j2 index b8f2f4ebf994..3f53d10c9225 100644 --- a/yamls/kind.yaml.j2 +++ b/yamls/kind.yaml.j2 @@ -41,18 +41,16 @@ apiVersion: kind.x-k8s.io/v1alpha4 networking: kubeProxyMode: {{ kube_proxy_mode }} disableDefaultCNI: true + ipFamily: {{ ip_family }} apiServerAddress: {{ api_server_address }} apiServerPort: {{ api_server_port }} -{%- if "ipv4" in ip_family %} - ipFamily: ipv4 +{%- if ip_family is equalto "ipv4" %} podSubnet: {{ pod_cidr_v4 }} serviceSubnet: {{ svc_cidr_v4 }} -{%- elif "ipv6" in ip_family %} - ipFamily: ipv6 +{%- elif ip_family is equalto "ipv6" %} podSubnet: "fd00:10:16::/112" serviceSubnet: "fd00:10:96::/108" {%- else %} - ipFamily: dual podSubnet: "10.16.0.0/16,fd00:10:16::/112" serviceSubnet: "10.96.0.0/12,fd00:10:96::/108" {%- endif %}