Skip to content

Commit 12c5565

Browse files
committed
tini
Signed-off-by: zhangzujian <[email protected]>
1 parent 1a160ce commit 12c5565

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

charts/kube-ovn/templates/ovsovn-ds.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
{{- if .Values.DPDK }}
4848
command: ["/kube-ovn/start-ovs-dpdk.sh"]
4949
{{- else }}
50-
command:
50+
args:
5151
{{- if .Values.DISABLE_MODULES_MANAGEMENT }}
5252
- /bin/sh
5353
- -ec

dist/images/Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ FROM kubeovn/kube-ovn-base:$BASE_TAG
55

66
RUN apt update && apt install psmisc -y
77

8+
ARG TINI_VERSION=v0.19.0
9+
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
10+
RUN chmod +x /tini
11+
ENTRYPOINT ["/tini", "-svw", "--"]
12+
813
COPY *.sh /kube-ovn/
914
COPY kubectl-ko /kube-ovn/kubectl-ko
1015
COPY 01-kube-ovn.conflist /kube-ovn/01-kube-ovn.conflist

dist/images/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3646,7 +3646,7 @@ spec:
36463646
- name: openvswitch
36473647
image: "$REGISTRY/kube-ovn:$VERSION"
36483648
imagePullPolicy: $IMAGE_PULL_POLICY
3649-
command:
3649+
args:
36503650
- /kube-ovn/start-ovs.sh
36513651
securityContext:
36523652
runAsUser: 0

0 commit comments

Comments
 (0)