Skip to content

Commit 112101e

Browse files
authored
Merge pull request #13 from Mellanox/ovnk_upstream_jan15
changes for using latest upstream OVN-Kubernetes
2 parents fa26433 + 549fb80 commit 112101e

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

Dockerfile.ovn-kubernetes.ubuntu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} make -C ovn-kubernetes/d
3535
# Main Ubuntu Image Stage #
3636
#################################
3737

38-
FROM ubuntu:25.04
38+
FROM ubuntu:25.10
3939

4040
ARG TARGETARCH
4141
ARG TARGETOS=linux
@@ -80,4 +80,4 @@ LABEL io.k8s.display-name="ovn-kubernetes" \
8080
io.k8s.description="ovnkube ubuntu image"
8181

8282
WORKDIR /root
83-
ENTRYPOINT /root/ovnkube.sh
83+
ENTRYPOINT /root/ovnkube.sh

helm/ovn-kubernetes-dpf/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ apiVersion: v2
22
name: ovn-kubernetes-chart
33
description: Helm chart to deploy ovn-kubernetes in the NVIDIA DOCA Platform Framework (DPF) context
44
type: application
5-
version: 1.1.0
6-
appVersion: "1.1.0"
5+
version: 1.2.0
6+
appVersion: "1.2.0"
77
home: https://ovn-kubernetes.io/
88
icon: https://www.ovn.org/images/ovn-logo.png
99
sources:
1010
- https://github.com/ovn-org/ovn-kubernetes
1111
- https://github.com/ovn-org/ovn
1212
dependencies:
1313
- name: ovn-kubernetes-resource-injector
14-
version: 1.1.0
14+
version: 1.2.0
1515
condition: ovn-kubernetes-resource-injector.enabled

helm/ovn-kubernetes-dpf/charts/ovn-kubernetes-resource-injector/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ type: application
1313
# This is the chart version. This version number should be incremented each time you make changes
1414
# to the chart and its templates, including the app version.
1515
# Versions are expected to follow Semantic Versioning (https://semver.org/)
16-
version: 1.1.0
16+
version: 1.2.0
1717
# This is the version number of the application being deployed. This version number should be
1818
# incremented each time you make changes to the application. Versions are not expected to
1919
# follow Semantic Versioning. They should reflect the version the application is using.
2020
# It is recommended to use it with quotes.
21-
appVersion: "1.1.0"
21+
appVersion: "1.2.0"

helm/ovn-kubernetes-dpf/templates/control-plane-manifests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ spec:
213213
memory: 300Mi
214214
env:
215215
- name: OVN_DAEMONSET_VERSION
216-
value: "1.1.0"
216+
value: "1.2.0"
217217
- name: OVNKUBE_LOGLEVEL
218218
value: "4"
219219
- name: OVNKUBE_LOGFILE_MAXSIZE

helm/ovn-kubernetes-dpf/templates/dpu-manifests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ spec:
359359
memory: 300Mi
360360
env:
361361
- name: OVN_DAEMONSET_VERSION
362-
value: "1.1.0"
362+
value: "1.2.0"
363363
- name: OVN_LOGLEVEL_NB
364364
value: "-vconsole:info -vfile:info"
365365
- name: K8S_APISERVER
@@ -416,7 +416,7 @@ spec:
416416
memory: 300Mi
417417
env:
418418
- name: OVN_DAEMONSET_VERSION
419-
value: "1.1.0"
419+
value: "1.2.0"
420420
- name: OVN_LOGLEVEL_SB
421421
value: "-vconsole:info -vfile:info"
422422
- name: K8S_APISERVER
@@ -474,7 +474,7 @@ spec:
474474
memory: 300Mi
475475
env:
476476
- name: OVN_DAEMONSET_VERSION
477-
value: "1.1.0"
477+
value: "1.2.0"
478478
- name: OVN_LOGLEVEL_NORTHD
479479
value: "-vconsole:info -vfile:info"
480480
- name: K8S_APISERVER
@@ -557,7 +557,7 @@ spec:
557557
- name: OVN_EGRESSSERVICE_ENABLE
558558
value: ""
559559
- name: OVN_DAEMONSET_VERSION
560-
value: "1.1.0"
560+
value: "1.2.0"
561561
- name: OVNKUBE_LOGLEVEL
562562
value: "4"
563563
- name: OVNKUBE_LOGFILE_MAXSIZE
@@ -753,7 +753,7 @@ spec:
753753
memory: 300Mi
754754
env:
755755
- name: OVN_DAEMONSET_VERSION
756-
value: "1.1.0"
756+
value: "1.2.0"
757757
- name: OVN_LOGLEVEL_CONTROLLER
758758
value: "-vconsole:info"
759759
- name: K8S_APISERVER
@@ -800,7 +800,7 @@ spec:
800800
memory: 300Mi
801801
env:
802802
- name: OVN_DAEMONSET_VERSION
803-
value: "1.1.0"
803+
value: "1.2.0"
804804
- name: K8S_NODE_IP
805805
valueFrom:
806806
fieldRef:

helm/ovn-kubernetes-dpf/templates/host-with-dpu-manifests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ spec:
161161
memory: 300Mi
162162
env:
163163
- name: OVN_DAEMONSET_VERSION
164-
value: "1.1.0"
164+
value: "1.2.0"
165165
- name: OVNKUBE_LOGLEVEL
166166
value: "4"
167167
- name: OVNKUBE_LOGFILE_MAXSIZE

helm/ovn-kubernetes-dpf/templates/host-without-dpu-manifests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ spec:
154154
memory: 300Mi
155155
env:
156156
- name: OVN_DAEMONSET_VERSION
157-
value: "1.1.0"
157+
value: "1.2.0"
158158
- name: OVN_LOGLEVEL_NB
159159
value: "-vconsole:info -vfile:info"
160160
- name: K8S_APISERVER
@@ -211,7 +211,7 @@ spec:
211211
memory: 300Mi
212212
env:
213213
- name: OVN_DAEMONSET_VERSION
214-
value: "1.1.0"
214+
value: "1.2.0"
215215
- name: OVN_LOGLEVEL_SB
216216
value: "-vconsole:info -vfile:info"
217217
- name: K8S_APISERVER
@@ -269,7 +269,7 @@ spec:
269269
memory: 300Mi
270270
env:
271271
- name: OVN_DAEMONSET_VERSION
272-
value: "1.1.0"
272+
value: "1.2.0"
273273
- name: OVN_LOGLEVEL_NORTHD
274274
value: "-vconsole:info -vfile:info"
275275
- name: K8S_APISERVER
@@ -346,7 +346,7 @@ spec:
346346
- name: OVN_EGRESSSERVICE_ENABLE
347347
value: ""
348348
- name: OVN_DAEMONSET_VERSION
349-
value: "1.1.0"
349+
value: "1.2.0"
350350
- name: OVNKUBE_LOGLEVEL
351351
value: "4"
352352
- name: OVNKUBE_LOGFILE_MAXSIZE
@@ -532,7 +532,7 @@ spec:
532532
memory: 300Mi
533533
env:
534534
- name: OVN_DAEMONSET_VERSION
535-
value: "1.1.0"
535+
value: "1.2.0"
536536
- name: OVN_LOGLEVEL_CONTROLLER
537537
value: "-vconsole:info"
538538
- name: K8S_APISERVER
@@ -580,7 +580,7 @@ spec:
580580
memory: 300Mi
581581
env:
582582
- name: OVN_DAEMONSET_VERSION
583-
value: "1.1.0"
583+
value: "1.2.0"
584584
- name: K8S_NODE_IP
585585
valueFrom:
586586
fieldRef:

ovn-kubernetes

Submodule ovn-kubernetes updated 1648 files

0 commit comments

Comments
 (0)