Skip to content

Commit 0fc3fdc

Browse files
kvapskvaps
authored
Update Kube-OVN to v1.13.10 (#847)
Signed-off-by: Andrei Kvapil <[email protected]> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Updated kube-ovn chart and container image to version v1.13.10. - **Bug Fixes** - Adjusted volume mount paths in the ovncni DaemonSet for improved configuration consistency. - **Chores** - Streamlined Dockerfile to use the official kube-ovn image directly. - Automated version synchronization between chart files and Dockerfile for better maintainability. - **Improvements** - Removed NetworkManager synchronization to optimize controller runtime behavior. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 07d7fad + 04e2b39 commit 0fc3fdc

6 files changed

Lines changed: 10 additions & 67 deletions

File tree

‎packages/system/kubeovn/Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
KUBEOVN_TAG = v1.13.8
1+
KUBEOVN_TAG=$(shell awk '$$1 == "version:" {print $$2}' charts/kubeovn/Chart.yaml)
22

33
export NAME=kubeovn
44
export NAMESPACE=cozy-$(NAME)
@@ -13,6 +13,8 @@ update:
1313
tar xzvf - --strip 1 kube-ovn-$${tag#*v}/charts
1414
patch --no-backup-if-mismatch -p4 < patches/cozyconfig.diff
1515
patch --no-backup-if-mismatch -p4 < patches/mtu.diff
16+
version=$$(awk '$$1 == "version:" {print $$2}' charts/kube-ovn/Chart.yaml) && \
17+
sed -i "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/kubeovn/Dockerfile
1618

1719
image:
1820
docker buildx build images/kubeovn \

‎packages/system/kubeovn/charts/kube-ovn/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: v1.13.8
18+
version: v1.13.10
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "1.13.8"
24+
appVersion: "1.13.10"
2525

2626
kubeVersion: ">= 1.23.0-0"

‎packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,10 @@ spec:
271271
{{- if .Values.cni_conf.MOUNT_LOCAL_BIN_DIR }}
272272
- name: local-bin
273273
hostPath:
274-
path: {{ .Values.cni_conf.MOUNT_LOCAL_BIN_DIR }}
274+
path: {{ .Values.cni_conf.LOCAL_BIN_DIR }}
275275
{{- end }}
276276
{{- if .Values.func.ENABLE_OVN_IPSEC }}
277277
- name: ovs-ipsec-keys
278278
hostPath:
279-
path: /etc/origin/ovs_ipsec_keys
279+
path: {{ .Values.OPENVSWITCH_DIR }}
280280
{{- end }}

‎packages/system/kubeovn/charts/kube-ovn/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ global:
1010
repository: kube-ovn
1111
dpdkRepository: kube-ovn-dpdk
1212
vpcRepository: vpc-nat-gateway
13-
tag: v1.13.8
13+
tag: v1.13.10
1414
support_arm: true
1515
thirdparty: true
1616

‎packages/system/kubeovn/images/kubeovn/Dockerfile‎

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,5 @@
1-
# syntax = docker/dockerfile:experimental
2-
ARG VERSION=v1.13.8
3-
ARG BASE_TAG=$VERSION
4-
5-
FROM golang:1.23-bookworm as builder
6-
7-
ARG TAG=v1.13.8
8-
RUN git clone --branch ${TAG} --depth 1 https://github.com/kubeovn/kube-ovn /source
9-
10-
WORKDIR /source
11-
12-
COPY patches /patches
13-
RUN git apply /patches/*.diff
14-
RUN make build-go
15-
16-
WORKDIR /source/dist/images
17-
18-
# imported from https://github.com/kubeovn/kube-ovn/blob/master/dist/images/Dockerfile
19-
FROM kubeovn/kube-ovn-base:$BASE_TAG AS setcap
20-
21-
COPY --from=builder /source/dist/images/*.sh /kube-ovn/
22-
COPY --from=builder /source/dist/images/kubectl-ko /kube-ovn/kubectl-ko
23-
COPY --from=builder /source/dist/images/01-kube-ovn.conflist /kube-ovn/01-kube-ovn.conflist
24-
25-
COPY --from=builder /source/dist/images/kube-ovn /kube-ovn/kube-ovn
26-
COPY --from=builder /source/dist/images/kube-ovn-cmd /kube-ovn/kube-ovn-cmd
27-
COPY --from=builder /source/dist/images/kube-ovn-daemon /kube-ovn/kube-ovn-daemon
28-
COPY --from=builder /source/dist/images/kube-ovn-controller /kube-ovn/kube-ovn-controller
29-
RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \
30-
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-speaker && \
31-
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-webhook && \
32-
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-leader-checker && \
33-
ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-ic-controller && \
34-
ln -s /kube-ovn/kube-ovn-controller /kube-ovn/kube-ovn-pinger && \
35-
setcap CAP_NET_BIND_SERVICE+eip /kube-ovn/kube-ovn-cmd && \
36-
setcap CAP_NET_RAW,CAP_NET_BIND_SERVICE+eip /kube-ovn/kube-ovn-controller && \
37-
setcap CAP_NET_ADMIN,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /kube-ovn/kube-ovn-daemon
38-
39-
FROM kubeovn/kube-ovn-base:$BASE_TAG
40-
41-
COPY --chmod=0644 --from=builder /source/dist/images/logrotate/* /etc/logrotate.d/
42-
COPY --from=builder /source/dist/images/grace_stop_ovn_controller /usr/share/ovn/scripts/grace_stop_ovn_controller
43-
44-
COPY --from=setcap /kube-ovn /kube-ovn
45-
RUN /kube-ovn/iptables-wrapper-installer.sh --no-sanity-check
46-
47-
WORKDIR /kube-ovn
1+
ARG VERSION=v1.13.10
2+
FROM kubeovn/kube-ovn:${VERSION}
483

494
# Fix https://github.com/kubeovn/kube-ovn/issues/4526
505
RUN setcap CAP_NET_ADMIN,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /usr/lib/openvswitch-switch/ovs-vswitchd \

‎packages/system/kubeovn/images/kubeovn/patches/disable-nm-syncer.diff‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)