Skip to content

Commit 557ffa5

Browse files
authored
Update kube-ovn to latest version (#922)
This commit bumps kube-ovn to 1.13.11 and does away with patching the code now that the fixes necessary for kube-ovn to work properly in Talos have been released in the upstream.
2 parents ae05d2f + 3ac00ea commit 557ffa5

7 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎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.10
18+
version: v1.13.11
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.10"
24+
appVersion: "1.13.11"
2525

2626
kubeVersion: ">= 1.23.0-0"

‎packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ spec:
8383
- --node-switch={{ .Values.networking.NODE_SUBNET }}
8484
- --node-switch-cidr={{ index $cozyConfig.data "ipv4-join-cidr" }}
8585
- --service-cluster-ip-range={{ index $cozyConfig.data "ipv4-svc-cidr" }}
86+
{{- if .Values.global.logVerbosity }}
87+
- --v={{ .Values.global.logVerbosity }}
88+
{{- end }}
8689
- --network-type={{- .Values.networking.NETWORK_TYPE }}
8790
- --default-provider-name={{ .Values.networking.vlan.PROVIDER_NAME }}
8891
- --default-interface-name={{- .Values.networking.vlan.VLAN_INTERFACE_NAME }}

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ spec:
3535
command:
3636
- sh
3737
- -xec
38-
- {{ if not .Values.DISABLE_MODULES_MANAGEMENT -}}
39-
iptables -V
40-
{{- else -}}
41-
echo "nothing to do"
42-
{{- end }}
38+
- iptables -V
4339
securityContext:
4440
allowPrivilegeEscalation: true
4541
capabilities:
@@ -93,6 +89,9 @@ spec:
9389
- --node-switch={{ .Values.networking.NODE_SUBNET }}
9490
- --encap-checksum=true
9591
- --service-cluster-ip-range={{ index $cozyConfig.data "ipv4-svc-cidr" }}
92+
{{- if .Values.global.logVerbosity }}
93+
- --v={{ .Values.global.logVerbosity }}
94+
{{- end }}
9695
{{- if eq .Values.networking.NETWORK_TYPE "vlan" }}
9796
- --iface=
9897
{{- else}}
@@ -125,9 +124,6 @@ spec:
125124
- NET_RAW
126125
- SYS_ADMIN
127126
- SYS_PTRACE
128-
{{- if not .Values.DISABLE_MODULES_MANAGEMENT }}
129-
- SYS_MODULE
130-
{{- end }}
131127
- SYS_NICE
132128
env:
133129
- name: ENABLE_SSL

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ spec:
4949
- -xec
5050
- |
5151
chown -R nobody: /var/run/ovn /var/log/ovn /etc/openvswitch /var/run/openvswitch /var/log/openvswitch
52-
{{- if not .Values.DISABLE_MODULES_MANAGEMENT }}
5352
iptables -V
53+
{{- if not .Values.DISABLE_MODULES_MANAGEMENT }}
54+
/usr/share/openvswitch/scripts/ovs-ctl load-kmod
5455
{{- else }}
5556
ln -sf /bin/true /usr/local/sbin/modprobe
5657
ln -sf /bin/true /usr/local/sbin/modinfo
@@ -64,6 +65,9 @@ spec:
6465
privileged: true
6566
runAsUser: 0
6667
volumeMounts:
68+
- mountPath: /lib/modules
69+
name: host-modules
70+
readOnly: true
6771
- mountPath: /usr/local/sbin
6872
name: usr-local-sbin
6973
- mountPath: /var/log/ovn
@@ -96,9 +100,7 @@ spec:
96100
add:
97101
- NET_ADMIN
98102
- NET_BIND_SERVICE
99-
{{- if not .Values.DISABLE_MODULES_MANAGEMENT }}
100-
- SYS_MODULE
101-
{{- end }}
103+
- NET_RAW
102104
- SYS_NICE
103105
- SYS_ADMIN
104106
env:

‎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.10
13+
tag: v1.13.11
1414
support_arm: true
1515
thirdparty: true
1616

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
ARG VERSION=v1.13.10
1+
ARG VERSION=v1.13.11
22
FROM kubeovn/kube-ovn:${VERSION}
3-
4-
# Fix https://github.com/kubeovn/kube-ovn/issues/4526
5-
RUN setcap CAP_NET_ADMIN,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /usr/lib/openvswitch-switch/ovs-vswitchd \
6-
&& setcap CAP_NET_ADMIN,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /usr/sbin/xtables-legacy-multi \
7-
&& setcap CAP_NET_ADMIN,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /usr/sbin/xtables-nft-multi \
8-
&& setcap CAP_NET_ADMIN,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /usr/sbin/ipset \
9-
&& setcap CAP_NET_ADMIN,CAP_NET_RAW,CAP_SYS_ADMIN+eip /usr/bin/ip

‎packages/system/kubeovn/patches/cozyconfig.diff‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml b/
33
index d9a9a67..b2e12dd 100644
44
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
55
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
6-
@@ -51,18 +51,12 @@ spec:
6+
@@ -51,18 +51,15 @@ spec:
77
- bash
88
- /kube-ovn/start-cniserver.sh
99
args:
@@ -21,14 +21,17 @@ index d9a9a67..b2e12dd 100644
2121
- {{ .Values.ipv6.SVC_CIDR }}
2222
- {{- end }}
2323
+ - --service-cluster-ip-range={{ index $cozyConfig.data "ipv4-svc-cidr" }}
24+
+ {{- if .Values.global.logVerbosity }}
25+
+ - --v={{ .Values.global.logVerbosity }}
26+
+ {{- end }}
2427
{{- if eq .Values.networking.NETWORK_TYPE "vlan" }}
2528
- --iface=
2629
{{- else}}
2730
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml
2831
index 0e69494..756eb7c 100644
2932
--- a/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml
3033
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml
31-
@@ -52,46 +52,19 @@ spec:
34+
@@ -52,46 +52,22 @@ spec:
3235
image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }}
3336
imagePullPolicy: {{ .Values.image.pullPolicy }}
3437
args:
@@ -77,6 +80,9 @@ index 0e69494..756eb7c 100644
7780
- {{- end }}
7881
+ - --node-switch-cidr={{ index $cozyConfig.data "ipv4-join-cidr" }}
7982
+ - --service-cluster-ip-range={{ index $cozyConfig.data "ipv4-svc-cidr" }}
83+
+ {{- if .Values.global.logVerbosity }}
84+
+ - --v={{ .Values.global.logVerbosity }}
85+
+ {{- end }}
8086
- --network-type={{- .Values.networking.NETWORK_TYPE }}
8187
- --default-provider-name={{ .Values.networking.vlan.PROVIDER_NAME }}
8288
- --default-interface-name={{- .Values.networking.vlan.VLAN_INTERFACE_NAME }}

0 commit comments

Comments
 (0)