From a1c04f79a77a476cdce72423a3b1fd7e8d5a4e9a Mon Sep 17 00:00:00 2001
From: Six <23470032+6ixfalls@users.noreply.github.com>
Date: Fri, 31 Oct 2025 16:22:49 -0700
Subject: [PATCH] feat: allow vpcTag to be specified to override tag

Signed-off-by: Six <23470032+6ixfalls@users.noreply.github.com>
---
 charts/kube-ovn-v2/README.md                         | 12 +++++++++++-
 .../kube-ovn-v2/templates/nat-gw/vpc-nat-config.yaml |  2 +-
 charts/kube-ovn-v2/values.yaml                       |  4 ++--
 charts/kube-ovn/templates/vpc-nat-config.yaml        |  2 +-
 charts/kube-ovn/values.yaml                          |  2 ++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/charts/kube-ovn-v2/README.md b/charts/kube-ovn-v2/README.md
index 7ba0545196a..8532313e7b6 100644
--- a/charts/kube-ovn-v2/README.md
+++ b/charts/kube-ovn-v2/README.md
@@ -528,7 +528,8 @@ false
       "support_arm": true,
       "tag": "v1.14.0",
       "thirdparty": true,
-      "vpcRepository": "vpc-nat-gateway"
+      "vpcRepository": "vpc-nat-gateway",
+      "vpcTag": ""
     }
   },
   "registry": {
@@ -1512,6 +1513,15 @@ false
 </td>
 			<td>IPv6 CIDR.</td>
 		</tr>
+		<tr>
+			<td>networking.skipConntrackDstCidrs</td>
+			<td>string</td>
+			<td><pre lang="json">
+""
+</pre>
+</td>
+			<td>Comma-separated list of destination IP CIDRs that should skip conntrack processing.</td>
+		</tr>
 		<tr>
 			<td>networking.stack</td>
 			<td>string</td>
diff --git a/charts/kube-ovn-v2/templates/nat-gw/vpc-nat-config.yaml b/charts/kube-ovn-v2/templates/nat-gw/vpc-nat-config.yaml
index 06112ed9c6f..c225b1a70b7 100755
--- a/charts/kube-ovn-v2/templates/nat-gw/vpc-nat-config.yaml
+++ b/charts/kube-ovn-v2/templates/nat-gw/vpc-nat-config.yaml
@@ -4,7 +4,7 @@ metadata:
   name: ovn-vpc-nat-config
   namespace: {{ .Values.namespace }}
 data:
-  image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.vpcRepository }}:{{ .Values.global.images.kubeovn.tag }}
+  image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.vpcRepository }}:{{ or .Values.global.images.kubeovn.vpcTag .Values.global.images.kubeovn.tag }}
   {{- with .Values.natGw.bgpSpeaker.image }}
   bgpSpeakerImage: {{ .repository }}:{{ .tag }}
   {{- end }}
diff --git a/charts/kube-ovn-v2/values.yaml b/charts/kube-ovn-v2/values.yaml
index f50015cfea7..db592f65c07 100644
--- a/charts/kube-ovn-v2/values.yaml
+++ b/charts/kube-ovn-v2/values.yaml
@@ -9,6 +9,8 @@ global:
       repository: kube-ovn
       vpcRepository: vpc-nat-gateway
       tag: v1.14.0
+      # If empty, uses the same tag as kubeovn
+      vpcTag: ""
       support_arm: true
       thirdparty: true
 
@@ -264,7 +266,6 @@ cni:
   # @section -- CNI configuration
   nonPrimaryCNI: false
 
-
 # -- Configuration of the validating webhook used to verify custom resources before they are pushed to Kubernetes.
 # Make sure cert-manager is installed for the generation of certificates for the webhook.
 # See https://kubeovn.github.io/docs/stable/en/guide/webhook/
@@ -319,7 +320,6 @@ natGw:
     # @section -- NAT gateways configuration
     apiNadProvider: "{{ .Values.apiNad.name }}.{{ .Values.namespace }}.ovn"
 
-
 # -- Configuration for network policies
 # @section -- Network Policies
 # @default -- "{}"
diff --git a/charts/kube-ovn/templates/vpc-nat-config.yaml b/charts/kube-ovn/templates/vpc-nat-config.yaml
index ae9a0ce8ceb..37fdd9a226d 100755
--- a/charts/kube-ovn/templates/vpc-nat-config.yaml
+++ b/charts/kube-ovn/templates/vpc-nat-config.yaml
@@ -7,7 +7,7 @@ metadata:
     kubernetes.io/description: |
       kube-ovn vpc-nat common config
 data:
-  image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.vpcRepository }}:{{ .Values.global.images.kubeovn.tag }}
+  image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.vpcRepository }}:{{ or .Values.global.images.kubeovn.vpcTag .Values.global.images.kubeovn.tag }}
 
 ---
 kind: ConfigMap
diff --git a/charts/kube-ovn/values.yaml b/charts/kube-ovn/values.yaml
index f3dc5975792..bfaffa41bdc 100644
--- a/charts/kube-ovn/values.yaml
+++ b/charts/kube-ovn/values.yaml
@@ -10,6 +10,8 @@ global:
       repository: kube-ovn
       vpcRepository: vpc-nat-gateway
       tag: v1.15.0
+      # If empty, uses the same tag as kubeovn
+      vpcTag: ""
       support_arm: true
       thirdparty: true