diff --git a/charts/kube-ovn-v2/README.md b/charts/kube-ovn-v2/README.md
index 7ba0545196a..967d1c8b796 100644
--- a/charts/kube-ovn-v2/README.md
+++ b/charts/kube-ovn-v2/README.md
@@ -525,10 +525,7 @@ false
"images": {
"kubeovn": {
"repository": "kube-ovn",
- "support_arm": true,
- "tag": "v1.14.0",
- "thirdparty": true,
- "vpcRepository": "vpc-nat-gateway"
+ "tag": "v1.14.0"
}
},
"registry": {
@@ -1172,6 +1169,42 @@ false
"v1.15.0"
+ |
+ Image tag. |
+
+
+ | natGw.image |
+ object |
+
+"{}"
+
+ |
+ Image used by the NAT gateway. |
+
+
+ | natGw.image.pullPolicy |
+ string |
+
+"IfNotPresent"
+
+ |
+ Image pull policy. |
+
+
+ | natGw.image.repository |
+ string |
+
+"docker.io/kubeovn/vpc-nat-gateway"
+
+ |
+ Image repository. |
+
+
+ | natGw.image.tag |
+ string |
+
+"v1.15.0"
+
|
Image tag. |
@@ -1512,6 +1545,15 @@ false
IPv6 CIDR. |
+
+ | networking.skipConntrackDstCidrs |
+ string |
+
+""
+
+ |
+ Comma-separated list of destination IP CIDRs that should skip conntrack processing. |
+
| networking.stack |
string |
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..57e197856ab 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.natGw.image.repository }}:{{ .Values.natGw.image.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..0151ee09932 100644
--- a/charts/kube-ovn-v2/values.yaml
+++ b/charts/kube-ovn-v2/values.yaml
@@ -7,10 +7,7 @@ global:
images:
kubeovn:
repository: kube-ovn
- vpcRepository: vpc-nat-gateway
tag: v1.14.0
- support_arm: true
- thirdparty: true
# -- Image configuration.
# @section -- Global parameters
@@ -264,7 +261,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/
@@ -296,6 +292,19 @@ natGw:
# manually destroyed and recreated.
# @section -- NAT gateways configuration
namePrefix: "vpc-nat-gw"
+ # -- Image used by the NAT gateway.
+ # @section -- NAT gateways configuration
+ # @default -- "{}"
+ image:
+ # -- Image repository.
+ # @section -- NAT gateways configuration
+ repository: docker.io/kubeovn/vpc-nat-gateway
+ # -- Image tag.
+ # @section -- NAT gateways configuration
+ tag: v1.15.0
+ # -- Image pull policy.
+ # @section -- NAT gateways configuration
+ pullPolicy: IfNotPresent
# -- Configuration of the BGP sidecar for when a NAT gateway is running in BGP mode.
# @section -- NAT gateways configuration
# @default -- "{}"
@@ -319,7 +328,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..92e2fd94808 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.natgateway.repository }}:{{ or .Values.global.images.natgateway.tag .Values.global.images.kubeovn.tag }}
---
kind: ConfigMap
diff --git a/charts/kube-ovn/values.yaml b/charts/kube-ovn/values.yaml
index f3dc5975792..c473239ac67 100644
--- a/charts/kube-ovn/values.yaml
+++ b/charts/kube-ovn/values.yaml
@@ -8,10 +8,11 @@ global:
images:
kubeovn:
repository: kube-ovn
- vpcRepository: vpc-nat-gateway
tag: v1.15.0
- support_arm: true
- thirdparty: true
+ natgateway:
+ repository: vpc-nat-gateway
+ # Falls back to the same tag as kubeovn if empty
+ tag: ""
image:
pullPolicy: IfNotPresent