Skip to content

Commit 0c9250b

Browse files
authored
ci: fix loading vpc-nat-gateway image into kind cluster (#6128)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 547ea5e commit 0c9250b

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.github/workflows/build-x86-image.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,6 +1667,9 @@ jobs:
16671667
pipx install jinjanator
16681668
make kind-ghcr-pull kind-init-${{ matrix.ip-family }}
16691669
1670+
- name: Load vpc-nat-gateway image into kind cluster
1671+
run: make kind-load-image-vpc-nat-gateway
1672+
16701673
- name: Install Mults-CNI, Cilium, and Kube-OVN
16711674
id: install
16721675
run: make kind-install-multus-cilium-kubeovn-non-primary-${{ matrix.ip-family }}
@@ -1679,9 +1682,7 @@ jobs:
16791682
E2E_IP_FAMILY: ${{ matrix.ip-family }}
16801683
E2E_NETWORK_MODE: overlay
16811684
KUBE_OVN_PRIMARY_CNI: "false"
1682-
run: |
1683-
make kind-load-image-vpc-nat-gateway
1684-
make kube-ovn-non-primary-cni-e2e
1685+
run: make kube-ovn-non-primary-cni-e2e
16851686

16861687
- name: Collect k8s events
16871688
if: failure() && steps.e2e.conclusion == 'failure'

charts/kube-ovn/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ fullnameOverride: ""
145145
HYBRID_DPDK: false
146146
HUGEPAGE_SIZE_TYPE: hugepages-2Mi # Default
147147
HUGEPAGES: 1Gi
148-
DPDK_IMAGE_TAG: "v1.14.0-dpdk"
148+
DPDK_IMAGE_TAG: "v1.16.0-dpdk"
149149
DPDK_CPU: "1000m" # Default CPU configuration
150150
DPDK_MEMORY: "2Gi" # Default Memory configuration
151151

yamls/speaker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
type: RuntimeDefault
3434
containers:
3535
- name: kube-ovn-speaker
36-
image: "docker.io/kubeovn/kube-ovn:v1.15.0"
36+
image: "docker.io/kubeovn/kube-ovn:v1.16.0"
3737
imagePullPolicy: IfNotPresent
3838
command:
3939
- /kube-ovn/kube-ovn-speaker

yamls/vpc-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
kubernetes.io/description: |
88
kube-ovn vpc-nat common config
99
data:
10-
image: kubeovn/vpc-nat-gateway:v1.14.0
10+
image: kubeovn/vpc-nat-gateway:v1.16.0
1111
---
1212
kind: ConfigMap
1313
apiVersion: v1

yamls/webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
type: RuntimeDefault
3838
containers:
3939
- name: kube-ovn-webhook
40-
image: "docker.io/kubeovn/kube-ovn:v1.14.0"
40+
image: "docker.io/kubeovn/kube-ovn:v1.16.0"
4141
imagePullPolicy: IfNotPresent
4242
command:
4343
- /kube-ovn/kube-ovn-webhook

0 commit comments

Comments
 (0)