diff --git a/charts/kube-ovn/templates/central-deploy.yaml b/charts/kube-ovn/templates/central-deploy.yaml index 02a23d4f203..6227a62acc5 100644 --- a/charts/kube-ovn/templates/central-deploy.yaml +++ b/charts/kube-ovn/templates/central-deploy.yaml @@ -44,7 +44,7 @@ spec: - name: ovn-central image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - args: + command: - /kube-ovn/start-db.sh securityContext: capabilities: diff --git a/charts/kube-ovn/templates/ic-controller-deploy.yaml b/charts/kube-ovn/templates/ic-controller-deploy.yaml index 3ccee30ae47..d2b82d6c1d8 100644 --- a/charts/kube-ovn/templates/ic-controller-deploy.yaml +++ b/charts/kube-ovn/templates/ic-controller-deploy.yaml @@ -45,8 +45,8 @@ spec: - name: ovn-ic-controller image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} + command: ["/kube-ovn/start-ic-controller.sh"] args: - - /kube-ovn/start-ic-controller.sh - --log_file=/var/log/kube-ovn/kube-ovn-ic-controller.log - --log_file_max_size=0 - --logtostderr=false diff --git a/charts/kube-ovn/templates/monitor-deploy.yaml b/charts/kube-ovn/templates/monitor-deploy.yaml index 5ce29a3dd6b..cbdecba620d 100644 --- a/charts/kube-ovn/templates/monitor-deploy.yaml +++ b/charts/kube-ovn/templates/monitor-deploy.yaml @@ -42,8 +42,8 @@ spec: - name: kube-ovn-monitor image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} + command: ["/kube-ovn/start-ovn-monitor.sh"] args: - - /kube-ovn/start-ovn-monitor.sh - --log_file=/var/log/kube-ovn/kube-ovn-monitor.log - --logtostderr=false - --alsologtostderr=true diff --git a/charts/kube-ovn/templates/ovncni-ds.yaml b/charts/kube-ovn/templates/ovncni-ds.yaml index 9336349635c..18c8982b04f 100644 --- a/charts/kube-ovn/templates/ovncni-ds.yaml +++ b/charts/kube-ovn/templates/ovncni-ds.yaml @@ -45,8 +45,10 @@ spec: - name: cni-server image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }} imagePullPolicy: {{ .Values.image.pullPolicy }} - args: + command: + - bash - /kube-ovn/start-cniserver.sh + args: - --enable-mirror={{- .Values.debug.ENABLE_MIRROR }} - --mirror-iface={{- .Values.debug.MIRROR_IFACE }} - --node-switch={{ .Values.networking.NODE_SUBNET }} diff --git a/charts/kube-ovn/templates/ovsovn-ds.yaml b/charts/kube-ovn/templates/ovsovn-ds.yaml index eca4c9b0a07..6524c47fbe2 100644 --- a/charts/kube-ovn/templates/ovsovn-ds.yaml +++ b/charts/kube-ovn/templates/ovsovn-ds.yaml @@ -47,7 +47,7 @@ spec: {{- if .Values.DPDK }} command: ["/kube-ovn/start-ovs-dpdk.sh"] {{- else }} - args: + command: - /kube-ovn/start-ovs.sh {{- end }} securityContext: diff --git a/charts/kube-ovn/templates/pinger-ds.yaml b/charts/kube-ovn/templates/pinger-ds.yaml index cafee9a179f..8a0e9ea4cca 100644 --- a/charts/kube-ovn/templates/pinger-ds.yaml +++ b/charts/kube-ovn/templates/pinger-ds.yaml @@ -25,8 +25,9 @@ spec: containers: - name: pinger image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }} - args: + command: - /kube-ovn/kube-ovn-pinger + args: - --external-address= {{- if eq .Values.networking.NET_STACK "dual_stack" -}} {{ .Values.dual_stack.PINGER_EXTERNAL_ADDRESS }} diff --git a/dist/images/install-ic-server.sh b/dist/images/install-ic-server.sh index 2ac2fa22971..163d746fc5e 100755 --- a/dist/images/install-ic-server.sh +++ b/dist/images/install-ic-server.sh @@ -57,7 +57,7 @@ spec: - name: ovn-ic-server image: "$REGISTRY/kube-ovn:$VERSION" imagePullPolicy: $IMAGE_PULL_POLICY - args: ["/kube-ovn/start-ic-db.sh"] + command: ["/kube-ovn/start-ic-db.sh"] securityContext: capabilities: add: ["SYS_NICE"] diff --git a/dist/images/install.sh b/dist/images/install.sh index a9cf4ac1b4a..562fe0689fd 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -3265,7 +3265,7 @@ spec: - name: ovn-central image: "$REGISTRY/kube-ovn:$VERSION" imagePullPolicy: $IMAGE_PULL_POLICY - args: + command: - /kube-ovn/start-db.sh securityContext: capabilities: @@ -3595,7 +3595,7 @@ spec: - name: openvswitch image: "$REGISTRY/kube-ovn:$VERSION" imagePullPolicy: $IMAGE_PULL_POLICY - args: + command: - /kube-ovn/start-ovs.sh securityContext: runAsUser: 0 @@ -4129,8 +4129,10 @@ spec: - name: cni-server image: "$REGISTRY/kube-ovn:$VERSION" imagePullPolicy: $IMAGE_PULL_POLICY - args: + command: + - bash - /kube-ovn/start-cniserver.sh + args: - --enable-mirror=$ENABLE_MIRROR - --enable-arp-detect-ip-conflict=$ENABLE_ARP_DETECT_IP_CONFLICT - --encap-checksum=true @@ -4437,8 +4439,8 @@ spec: - name: kube-ovn-monitor image: "$REGISTRY/kube-ovn:$VERSION" imagePullPolicy: $IMAGE_PULL_POLICY + command: ["/kube-ovn/start-ovn-monitor.sh"] args: - - /kube-ovn/start-ovn-monitor.sh - --log_file=/var/log/kube-ovn/kube-ovn-monitor.log - --logtostderr=false - --alsologtostderr=true @@ -4647,8 +4649,8 @@ spec: - name: ovn-ic-controller image: "$REGISTRY/kube-ovn:$VERSION" imagePullPolicy: $IMAGE_PULL_POLICY + command: ["/kube-ovn/start-ic-controller.sh"] args: - - /kube-ovn/start-ic-controller.sh - --log_file=/var/log/kube-ovn/kube-ovn-ic-controller.log - --log_file_max_size=0 - --logtostderr=false diff --git a/dist/images/start-cniserver.sh b/dist/images/start-cniserver.sh index 47af66a0d62..1054bf9963b 100755 --- a/dist/images/start-cniserver.sh +++ b/dist/images/start-cniserver.sh @@ -60,4 +60,4 @@ set_sysctl net.ipv4.neigh.default.gc_thresh3 "$gc_thresh3" set_sysctl net.ipv4.ip_no_pmtu_disc "$SYSCTL_IPV4_IP_NO_PMTU_DISC" set_sysctl net.netfilter.nf_conntrack_tcp_be_liberal "$SYSCTL_NF_CONNTRACK_TCP_BE_LIBERAL" -exec ./kube-ovn-daemon --ovs-socket=${OVS_SOCK} --bind-socket=${CNI_SOCK} "$@" +./kube-ovn-daemon --ovs-socket=${OVS_SOCK} --bind-socket=${CNI_SOCK} "$@" diff --git a/dist/images/start-db.sh b/dist/images/start-db.sh index 9fa2fc805db..b4b59fa654f 100755 --- a/dist/images/start-db.sh +++ b/dist/images/start-db.sh @@ -526,4 +526,4 @@ ovs-appctl -t /var/run/ovn/ovnnb_db.ctl ovsdb-server/memory-trim-on-compaction o ovs-appctl -t /var/run/ovn/ovnsb_db.ctl ovsdb-server/memory-trim-on-compaction on chmod 600 /etc/ovn/* -exec /kube-ovn/kube-ovn-leader-checker --probeInterval=${OVN_LEADER_PROBE_INTERVAL} --enableCompact=${ENABLE_COMPACT} +/kube-ovn/kube-ovn-leader-checker --probeInterval=${OVN_LEADER_PROBE_INTERVAL} --enableCompact=${ENABLE_COMPACT} diff --git a/dist/images/start-ic-db.sh b/dist/images/start-ic-db.sh index ca7931c5b7a..2c9b4d937a0 100755 --- a/dist/images/start-ic-db.sh +++ b/dist/images/start-ic-db.sh @@ -213,7 +213,7 @@ fi if [[ $ENABLE_OVN_LEADER_CHECK == "true" ]]; then chmod 600 /etc/ovn/* - exec /kube-ovn/kube-ovn-leader-checker --probeInterval=${OVN_LEADER_PROBE_INTERVAL} --isICDBServer=true + /kube-ovn/kube-ovn-leader-checker --probeInterval=${OVN_LEADER_PROBE_INTERVAL} --isICDBServer=true else # Compatible with controller deployment methods before kube-ovn 1.11.16 TS_NAME=${TS_NAME:-ts} @@ -227,6 +227,6 @@ else fi ovn-ic-nbctl --may-exist ts-add "$TS_NAME" ovn-ic-nbctl set Transit_Switch ts external_ids:subnet="$TS_CIDR" - exec tail --follow=name --retry /var/log/ovn/ovsdb-server-ic-nb.log + tail --follow=name --retry /var/log/ovn/ovsdb-server-ic-nb.log fi diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh index e6a2e7ca6a0..db9f30de9f9 100755 --- a/dist/images/start-ovs.sh +++ b/dist/images/start-ovs.sh @@ -158,4 +158,4 @@ else fi chmod 600 /etc/openvswitch/* -exec tail --follow=name --retry /var/log/ovn/ovn-controller.log +tail --follow=name --retry /var/log/ovn/ovn-controller.log