Skip to content

Commit 245f9f9

Browse files
zbb88888zbb88888
authored
Merge branch 'master' into fix-nad-not-found
2 parents 08fdefa + cb157cf commit 245f9f9

File tree

19 files changed

+243
-230
lines changed

19 files changed

+243
-230
lines changed

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

Lines changed: 3 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ env:
2626
# renovate: datasource=github-releases depName=golangci-lint packageName=golangci/golangci-lint
2727
GOLANGCI_LINT_VERSION: v2.8.0
2828
# renovate: datasource=github-releases depName=helm packageName=helm/helm
29-
HELM_VERSION: v4.0.5
29+
HELM_VERSION: v4.1.0
3030
# renovate: datasource=github-releases depName=submariner packageName=submariner-io/submariner
3131
SUBMARINER_VERSION: 0.22.0
3232
# renovate: datasource=github-releases depName=talos packageName=siderolabs/talos
33-
TALOS_VERSION: v1.12.1
33+
TALOS_VERSION: v1.12.2
3434

3535
jobs:
3636
build-kube-ovn-base:
@@ -190,9 +190,7 @@ jobs:
190190
${{ runner.os }}-go-${{ env.GO_VERSION }}-x86-${{ github.base_ref }}-
191191
192192
- name: Unit test
193-
run: |
194-
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo
195-
make ut
193+
run: make ut
196194

197195
- uses: shogo82148/actions-goveralls@v1
198196
continue-on-error: true
@@ -436,11 +434,6 @@ jobs:
436434
${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ github.ref_name }}-
437435
${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ github.base_ref }}-
438436
439-
- name: Install ginkgo
440-
if: steps.lookup-go-cache.outputs.cache-hit != 'true'
441-
working-directory: ${{ env.E2E_DIR }}
442-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
443-
444437
- run: make e2e-build
445438
if: steps.lookup-go-cache.outputs.cache-hit != 'true'
446439
working-directory: ${{ env.E2E_DIR }}
@@ -562,10 +555,6 @@ jobs:
562555
version: ${{ env.KIND_VERSION }}
563556
install_only: true
564557

565-
- name: Install ginkgo
566-
working-directory: ${{ env.E2E_DIR }}
567-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
568-
569558
- name: Download image
570559
uses: actions/download-artifact@v7
571560
with:
@@ -767,10 +756,6 @@ jobs:
767756
version: ${{ env.KIND_VERSION }}
768757
install_only: true
769758

770-
- name: Install ginkgo
771-
working-directory: ${{ env.E2E_DIR }}
772-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
773-
774759
- name: Download image
775760
uses: actions/download-artifact@v7
776761
with:
@@ -939,10 +924,6 @@ jobs:
939924
version: ${{ env.KIND_VERSION }}
940925
install_only: true
941926

942-
- name: Install ginkgo
943-
working-directory: ${{ env.E2E_DIR }}
944-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
945-
946927
- name: Download image
947928
uses: actions/download-artifact@v7
948929
with:
@@ -1131,10 +1112,6 @@ jobs:
11311112
version: ${{ env.KIND_VERSION }}
11321113
install_only: true
11331114

1134-
- name: Install ginkgo
1135-
working-directory: ${{ env.E2E_DIR }}
1136-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1137-
11381115
- name: Download image
11391116
uses: actions/download-artifact@v7
11401117
with:
@@ -1328,10 +1305,6 @@ jobs:
13281305
version: ${{ env.KIND_VERSION }}
13291306
install_only: true
13301307

1331-
- name: Install ginkgo
1332-
working-directory: ${{ env.E2E_DIR }}
1333-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1334-
13351308
- name: Download image
13361309
uses: actions/download-artifact@v7
13371310
with:
@@ -1489,10 +1462,6 @@ jobs:
14891462
version: ${{ env.KIND_VERSION }}
14901463
install_only: true
14911464

1492-
- name: Install ginkgo
1493-
working-directory: ${{ env.E2E_DIR }}
1494-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1495-
14961465
- name: Download kube-ovn image
14971466
uses: actions/download-artifact@v7
14981467
with:
@@ -1641,10 +1610,6 @@ jobs:
16411610
version: ${{ env.KIND_VERSION }}
16421611
install_only: true
16431612

1644-
- name: Install ginkgo
1645-
working-directory: ${{ env.E2E_DIR }}
1646-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1647-
16481613
- name: Download image
16491614
uses: actions/download-artifact@v7
16501615
with:
@@ -2008,10 +1973,6 @@ jobs:
20081973
version: ${{ env.KIND_VERSION }}
20091974
install_only: true
20101975

2011-
- name: Install ginkgo
2012-
working-directory: ${{ env.E2E_DIR }}
2013-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2014-
20151976
- name: Download kube-ovn image
20161977
uses: actions/download-artifact@v7
20171978
with:
@@ -2155,10 +2116,6 @@ jobs:
21552116
version: ${{ env.KIND_VERSION }}
21562117
install_only: true
21572118

2158-
- name: Install ginkgo
2159-
working-directory: ${{ env.E2E_DIR }}
2160-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2161-
21622119
- name: Download kube-ovn image
21632120
uses: actions/download-artifact@v7
21642121
with:
@@ -2416,10 +2373,6 @@ jobs:
24162373
version: ${{ env.KIND_VERSION }}
24172374
install_only: true
24182375

2419-
- name: Install ginkgo
2420-
working-directory: ${{ env.E2E_DIR }}
2421-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2422-
24232376
- name: Download image
24242377
uses: actions/download-artifact@v7
24252378
with:
@@ -2554,10 +2507,6 @@ jobs:
25542507
version: ${{ env.KIND_VERSION }}
25552508
install_only: true
25562509

2557-
- name: Install ginkgo
2558-
working-directory: ${{ env.E2E_DIR }}
2559-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2560-
25612510
- name: Download image
25622511
uses: actions/download-artifact@v7
25632512
with:
@@ -2709,10 +2658,6 @@ jobs:
27092658
version: ${{ env.KIND_VERSION }}
27102659
install_only: true
27112660

2712-
- name: Install ginkgo
2713-
working-directory: ${{ env.E2E_DIR }}
2714-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2715-
27162661
- name: Download image
27172662
uses: actions/download-artifact@v7
27182663
with:
@@ -2868,10 +2813,6 @@ jobs:
28682813
version: ${{ env.KIND_VERSION }}
28692814
install_only: true
28702815

2871-
- name: Install ginkgo
2872-
working-directory: ${{ env.E2E_DIR }}
2873-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2874-
28752816
- name: Download image
28762817
uses: actions/download-artifact@v7
28772818
with:
@@ -3094,10 +3035,6 @@ jobs:
30943035
version: ${{ env.KIND_VERSION }}
30953036
install_only: true
30963037

3097-
- name: Install ginkgo
3098-
working-directory: ${{ env.E2E_DIR }}
3099-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3100-
31013038
- name: Download image
31023039
uses: actions/download-artifact@v7
31033040
with:
@@ -3274,10 +3211,6 @@ jobs:
32743211
version: ${{ env.KIND_VERSION }}
32753212
install_only: true
32763213

3277-
- name: Install ginkgo
3278-
working-directory: ${{ env.E2E_DIR }}
3279-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3280-
32813214
- name: Download kube-ovn image
32823215
uses: actions/download-artifact@v7
32833216
with:
@@ -3421,10 +3354,6 @@ jobs:
34213354
version: ${{ env.KIND_VERSION }}
34223355
install_only: true
34233356

3424-
- name: Install ginkgo
3425-
working-directory: ${{ env.E2E_DIR }}
3426-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3427-
34283357
- name: Download kube-ovn image
34293358
uses: actions/download-artifact@v7
34303359
with:
@@ -3568,10 +3497,6 @@ jobs:
35683497
version: ${{ env.KIND_VERSION }}
35693498
install_only: true
35703499

3571-
- name: Install ginkgo
3572-
working-directory: ${{ env.E2E_DIR }}
3573-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3574-
35753500
- name: Download kube-ovn image
35763501
uses: actions/download-artifact@v7
35773502
with:
@@ -3710,10 +3635,6 @@ jobs:
37103635
version: ${{ env.KIND_VERSION }}
37113636
install_only: true
37123637

3713-
- name: Install ginkgo
3714-
working-directory: ${{ env.E2E_DIR }}
3715-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3716-
37173638
- name: Download kube-ovn image
37183639
uses: actions/download-artifact@v7
37193640
with:
@@ -3856,10 +3777,6 @@ jobs:
38563777
version: ${{ env.KIND_VERSION }}
38573778
install_only: true
38583779

3859-
- name: Install ginkgo
3860-
working-directory: ${{ env.E2E_DIR }}
3861-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3862-
38633780
- name: Download kube-ovn image
38643781
uses: actions/download-artifact@v7
38653782
with:
@@ -3974,10 +3891,6 @@ jobs:
39743891
version: ${{ env.KIND_VERSION }}
39753892
install_only: true
39763893

3977-
- name: Install ginkgo
3978-
working-directory: ${{ env.E2E_DIR }}
3979-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3980-
39813894
- name: Download kube-ovn image
39823895
uses: actions/download-artifact@v7
39833896
with:

‎.github/workflows/scheduled-e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
# renovate: datasource=github-releases depName=kind packageName=kubernetes-sigs/kind
1515
KIND_VERSION: v0.31.0
1616
# renovate: datasource=github-releases depName=helm packageName=helm/helm
17-
HELM_VERSION: v4.0.5
17+
HELM_VERSION: v4.1.0
1818
# renovate: datasource=github-releases depName=submariner packageName=submariner-io/submariner
1919
SUBMARINER_VERSION: 0.22.0
2020

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,19 @@
529529
* zhangzujian
530530
* 张祖建
531531

532+
## v1.14.27 (2026-01-23)
533+
534+
* [edad2a50f](https://github.com/kubeovn/kube-ovn/commit/edad2a50f3a2cdacd4cf6ed79c50bcc5d5b47c57) release v1.14.27
535+
* [9ac4ac62e](https://github.com/kubeovn/kube-ovn/commit/9ac4ac62e67156f458ee7164756d5ea944a9a09c) fix(vpcnatgw): cannot DNAT same EIP and same external port on two different protocols (#6201)
536+
* [2f7908a35](https://github.com/kubeovn/kube-ovn/commit/2f7908a35c7f0ec744e1b05b44840f99c006fc24) fix: cleanup auto-created vlan subinterfaces on interface switch (#6193) (#6197)
537+
* [0f81ac2a3](https://github.com/kubeovn/kube-ovn/commit/0f81ac2a3e6ed4496a83be64c50293da10d3e53f) prepare for next release
538+
539+
### Contributors
540+
541+
* Mengxin Liu
542+
* SKALA NETWORKS
543+
* changluyi
544+
532545
## v1.14.26 (2026-01-16)
533546

534547
* [42213f789](https://github.com/kubeovn/kube-ovn/commit/42213f7893e22352c2bb1dc3830e552c0c60cb93) release v1.14.26

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ DEBUG_TAG = $(shell cat VERSION)-debug
1515
LEGACY_TAG = $(shell cat VERSION)-amd64-legacy
1616
VERSION = $(shell echo $${VERSION:-$(RELEASE_TAG)})
1717

18+
GINKGO = go tool github.com/onsi/ginkgo/v2/ginkgo
19+
1820
CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/control-plane
1921

2022
FRR_VERSION = 9.1.3

‎charts/kube-ovn-v2/templates/agent/agent-daemonset.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ spec:
143143
- --ovs-vsctl-concurrency={{ .Values.performance.ovsVsctlConcurrency }}
144144
- --secure-serving={{- .Values.features.enableSecureServing }}
145145
- --enable-ovn-ipsec={{- .Values.features.enableOvnIpsec }}
146+
- --non-primary-cni-mode={{- .Values.cni.nonPrimaryCNI }}
146147
securityContext:
147148
runAsGroup: 0
148149
runAsUser: 0

‎charts/kube-ovn-v2/templates/speaker/speaker.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,13 @@ spec:
7272
imagePullPolicy: {{ .Values.image.pullPolicy }}
7373
command:
7474
- /kube-ovn/kube-ovn-speaker
75-
{{- with .Values.bgpSpeaker.args }}
7675
args:
77-
{{- toYaml . | trim | nindent 14 }}
76+
- --logtostderr=false
77+
- --alsologtostderr=true
78+
- --log_file=/var/log/kube-ovn/kube-ovn-speaker.log
79+
- --log_file_max_size=200
80+
{{- with .Values.bgpSpeaker.args }}
81+
{{- toYaml . | trim | nindent 12 }}
7882
{{- end }}
7983
env:
8084
- name: POD_IP

‎charts/kube-ovn/templates/ovncni-ds.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ spec:
125125
- --secure-serving={{- .Values.func.SECURE_SERVING }}
126126
- --enable-ovn-ipsec={{- .Values.func.ENABLE_OVN_IPSEC }}
127127
- --set-vxlan-tx-off={{- .Values.func.SET_VXLAN_TX_OFF }}
128+
- --non-primary-cni-mode={{- .Values.cni_conf.NON_PRIMARY_CNI }}
128129
securityContext:
129130
runAsUser: 0
130131
privileged: false

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/parnurzeal/gorequest v0.3.0
4040
github.com/prometheus-community/pro-bing v0.7.0
4141
github.com/prometheus/client_golang v1.23.2
42-
github.com/puzpuzpuz/xsync/v4 v4.3.0
42+
github.com/puzpuzpuz/xsync/v4 v4.4.0
4343
github.com/scylladb/go-set v1.0.2
4444
github.com/sirupsen/logrus v1.9.4
4545
github.com/spf13/pflag v1.0.10
@@ -326,6 +326,7 @@ replace (
326326

327327
tool (
328328
github.com/kubeovn/kube-ovn/tools/modernize
329+
github.com/onsi/ginkgo/v2/ginkgo
329330
github.com/ovn-kubernetes/libovsdb/cmd/modelgen
330331
go.uber.org/mock/mockgen
331332
k8s.io/code-generator/cmd/applyconfiguration-gen

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+L
567567
github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
568568
github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
569569
github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
570-
github.com/puzpuzpuz/xsync/v4 v4.3.0 h1:w/bWkEJdYuRNYhHn5eXnIT8LzDM1O629X1I9MJSkD7Q=
571-
github.com/puzpuzpuz/xsync/v4 v4.3.0/go.mod h1:VJDmTCJMBt8igNxnkQd86r+8KUeN1quSfNKu5bLYFQo=
570+
github.com/puzpuzpuz/xsync/v4 v4.4.0 h1:vlSN6/CkEY0pY8KaB0yqo/pCLZvp9nhdbBdjipT4gWo=
571+
github.com/puzpuzpuz/xsync/v4 v4.4.0/go.mod h1:VJDmTCJMBt8igNxnkQd86r+8KUeN1quSfNKu5bLYFQo=
572572
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
573573
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
574574
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=

0 commit comments

Comments
 (0)