From a30d88d0307edff1ae2c37a6f61a102cd6bf7e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= <zhangzujian.7@gmail.com>
Date: Fri, 11 Oct 2024 16:04:15 +0800
Subject: [PATCH] chart: fix value of env OVN_DB_IPS (#4595)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
---
 charts/kube-ovn/templates/ic-controller-deploy.yaml | 2 +-
 charts/kube-ovn/values.yaml                         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/charts/kube-ovn/templates/ic-controller-deploy.yaml b/charts/kube-ovn/templates/ic-controller-deploy.yaml
index acb446ddd42..4dec76ee163 100644
--- a/charts/kube-ovn/templates/ic-controller-deploy.yaml
+++ b/charts/kube-ovn/templates/ic-controller-deploy.yaml
@@ -88,7 +88,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: OVN_DB_IPS
-              value: "{{ .Values.MASTER_NODES }}"
+              value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
           resources:
             requests:
               cpu: 300m
diff --git a/charts/kube-ovn/values.yaml b/charts/kube-ovn/values.yaml
index 5e5f71e135d..38291570d4a 100644
--- a/charts/kube-ovn/values.yaml
+++ b/charts/kube-ovn/values.yaml
@@ -58,7 +58,6 @@ networking:
 func:
   ENABLE_LB: true
   ENABLE_NP: true
-  ENABLE_EIP_SNAT: true
   ENABLE_EXTERNAL_VPC: true
   HW_OFFLOAD: false
   ENABLE_LB_SVC: false
@@ -130,7 +129,6 @@ OPENVSWITCH_DIR: "/etc/origin/openvswitch"
 OVN_DIR: "/etc/origin/ovn"
 DISABLE_MODULES_MANAGEMENT: false
 
-imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""