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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −5
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion charts/kube-ovn-v2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,8 @@ false
"support_arm": true,
"tag": "v1.14.0",
"thirdparty": true,
"vpcRepository": "vpc-nat-gateway"
"vpcRepository": "vpc-nat-gateway",
"vpcTag": ""
}
},
"registry": {
Expand Down Expand Up @@ -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>
Comment on lines +1516 to +1524
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This documentation change for networking.skipConntrackDstCidrs seems unrelated to the main purpose of this pull request, which is to allow specifying vpcTag. To maintain a clean and focused commit history, it's generally better to submit unrelated changes in separate pull requests. Please consider moving this change to a separate PR.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran helm-docs to regenerate the chart README - that wasn't added from a prior commit by someone else.

<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.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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/kube-ovn-v2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -319,7 +320,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.kubeovn.vpcRepository }}:{{ or .Values.global.images.kubeovn.vpcTag .Values.global.images.kubeovn.tag }}

---
kind: ConfigMap
Expand Down
2 changes: 2 additions & 0 deletions charts/kube-ovn/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down