Skip to content

feat: allow vpcTag to be specified to override tag #5845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oilbeater merged 3 commits into from
Nov 6, 2025
Merged

feat: allow vpcTag to be specified to override tag #5845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1c04f7
feat: allow vpcTag to be specified to override tag
6ixfalls Oct 31, 2025
4152b02
feat: move natgateway into own block
6ixfalls Nov 4, 2025
21df653
feat(chart): seperate v2 image
6ixfalls Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 46 additions & 4 deletions charts/kube-ovn-v2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -1172,6 +1169,42 @@ false
<td><pre lang="json">
"v1.15.0"
</pre>
</td>
<td>Image tag.</td>
</tr>
<tr>
<td>natGw.image</td>
<td>object</td>
<td><pre lang="">
"{}"
</pre>
</td>
<td>Image used by the NAT gateway.</td>
</tr>
<tr>
<td>natGw.image.pullPolicy</td>
<td>string</td>
<td><pre lang="json">
"IfNotPresent"
</pre>
</td>
<td>Image pull policy.</td>
</tr>
<tr>
<td>natGw.image.repository</td>
<td>string</td>
<td><pre lang="json">
"docker.io/kubeovn/vpc-nat-gateway"
</pre>
</td>
<td>Image repository.</td>
</tr>
<tr>
<td>natGw.image.tag</td>
<td>string</td>
<td><pre lang="json">
"v1.15.0"
</pre>
</td>
<td>Image tag.</td>
</tr>
Expand Down Expand Up @@ -1512,6 +1545,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>
Comment thread
6ixfalls marked this conversation as resolved.
<tr>
<td>networking.stack</td>
<td>string</td>
Expand Down
2 changes: 1 addition & 1 deletion charts/kube-ovn-v2/templates/nat-gw/vpc-nat-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
18 changes: 13 additions & 5 deletions charts/kube-ovn-v2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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 -- "{}"
Expand All @@ -319,7 +328,6 @@ natGw:
# @section -- NAT gateways configuration
apiNadProvider: "{{ .Values.apiNad.name }}.{{ .Values.namespace }}.ovn"


# -- Configuration for network policies
# @section -- Network Policies
# @default -- "{}"
Expand Down
2 changes: 1 addition & 1 deletion charts/kube-ovn/templates/vpc-nat-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions charts/kube-ovn/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down