Merge pull request #698 from kchennag/fix/network-egress-default

Fix: align Network egressIPConfig with default oc get output (CNF-22543

Author: openshift-merge-bot[bot]

telco-core/configuration/reference-crs-kube-compare/required/networking/Network.yaml

@@ -7,8 +7,13 @@ spec:
     ovnKubernetesConfig:
       gatewayConfig:
         routingViaHost: true
+{{- $eip := .spec.defaultNetwork.ovnKubernetesConfig.egressIPConfig }}
+{{- if and $eip $eip.reachabilityTotalTimeoutSeconds }}
       egressIPConfig:
         reachabilityTotalTimeoutSeconds: 1
+{{- else }}
+      egressIPConfig: {}
+{{- end }}
   {{ if hasKey .spec "useMultiNetworkPolicy" }}
   useMultiNetworkPolicy: {{ .spec.useMultiNetworkPolicy }}
   {{ end }}

telco-core/configuration/reference-crs/required/networking/Network.yaml

@@ -10,6 +10,7 @@ spec:
     ovnKubernetesConfig:
       gatewayConfig:
         routingViaHost: true
+      # Kube-compare template matches either {} or explicit reachabilityTotalTimeoutSeconds: 1 (default).
       egressIPConfig:
         reachabilityTotalTimeoutSeconds: 1
   # additional networks are optional and may alternatively be specified using NetworkAttachmentDefinition CRs