Skip to content

ci: fix loading vpc-nat-gateway image into kind cluster #6128

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
zhangzujian merged 1 commit into from
Jan 6, 2026
Merged

ci: fix loading vpc-nat-gateway image into kind cluster #6128

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
7 changes: 4 additions & 3 deletions .github/workflows/build-x86-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1667,6 +1667,9 @@ jobs:
pipx install jinjanator
make kind-ghcr-pull kind-init-${{ matrix.ip-family }}

- name: Load vpc-nat-gateway image into kind cluster
run: make kind-load-image-vpc-nat-gateway

- name: Install Mults-CNI, Cilium, and Kube-OVN
id: install
run: make kind-install-multus-cilium-kubeovn-non-primary-${{ matrix.ip-family }}
Expand All @@ -1679,9 +1682,7 @@ jobs:
E2E_IP_FAMILY: ${{ matrix.ip-family }}
E2E_NETWORK_MODE: overlay
KUBE_OVN_PRIMARY_CNI: "false"
run: |
make kind-load-image-vpc-nat-gateway
make kube-ovn-non-primary-cni-e2e
run: make kube-ovn-non-primary-cni-e2e

- name: Collect k8s events
if: failure() && steps.e2e.conclusion == 'failure'
Expand Down
2 changes: 1 addition & 1 deletion charts/kube-ovn/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ fullnameOverride: ""
HYBRID_DPDK: false
HUGEPAGE_SIZE_TYPE: hugepages-2Mi # Default
HUGEPAGES: 1Gi
DPDK_IMAGE_TAG: "v1.14.0-dpdk"
DPDK_IMAGE_TAG: "v1.16.0-dpdk"
DPDK_CPU: "1000m" # Default CPU configuration
DPDK_MEMORY: "2Gi" # Default Memory configuration

Expand Down
2 changes: 1 addition & 1 deletion yamls/speaker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
type: RuntimeDefault
containers:
- name: kube-ovn-speaker
image: "docker.io/kubeovn/kube-ovn:v1.15.0"
image: "docker.io/kubeovn/kube-ovn:v1.16.0"
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Jan 6, 2026

Choose a reason for hiding this comment

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

medium

While updating this version to v1.16.0 is correct for consistency, this change highlights a maintainability issue. Image versions are hardcoded across multiple static YAML files (speaker.yaml, webhook.yaml, etc.). This practice is error-prone and led to the version inconsistencies that this PR is fixing (e.g., some images were at v1.14.0 while others were at v1.15.0).

To improve maintainability, consider using a tool like Kustomize to manage these manifests. With Kustomize, you could define the image tags in a central kustomization.yaml file and have it patch all the manifests automatically. This would prevent version drift and simplify future updates.

imagePullPolicy: IfNotPresent
command:
- /kube-ovn/kube-ovn-speaker
Expand Down
2 changes: 1 addition & 1 deletion yamls/vpc-configmap.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: kubeovn/vpc-nat-gateway:v1.14.0
image: kubeovn/vpc-nat-gateway:v1.16.0
---
kind: ConfigMap
apiVersion: v1
Expand Down
2 changes: 1 addition & 1 deletion yamls/webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
type: RuntimeDefault
containers:
- name: kube-ovn-webhook
image: "docker.io/kubeovn/kube-ovn:v1.14.0"
image: "docker.io/kubeovn/kube-ovn:v1.16.0"
imagePullPolicy: IfNotPresent
command:
- /kube-ovn/kube-ovn-webhook
Expand Down
Loading