fix defunct ovn-nbctl daemon

kubeovn · May 13, 2022 · 0695d31 · 0695d31
1 parent f8594a2
commit 0695d31
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base
@@ -76,3 +76,11 @@ RUN --mount=type=bind,target=/packages,from=ovs-builder,source=/packages  \
     dpkg -i /packages/openvswitch-*.deb && \
     dpkg -i /packages/python3-openvswitch*.deb &&\
     dpkg -i --ignore-depends=openvswitch-switch,openvswitch-common /packages/ovn-*.deb
+
+ENV DUMB_INIT_VERSION="1.2.5"
+RUN dump_arch="x86_64"; \
+    if [ "$ARCH" = "arm64" ]; then dump_arch="aarch64"; fi; \
+    curl -sSf -L --retry 5 -o /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_${dump_arch} && \
+    chmod +x /usr/bin/dumb-init
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1872,9 +1872,8 @@ spec:
         - name: kube-ovn-controller
           image: "$REGISTRY/kube-ovn:$VERSION"
           imagePullPolicy: $IMAGE_PULL_POLICY
-          command:
-          - /kube-ovn/start-controller.sh
           args:
+          - /kube-ovn/start-controller.sh
           - --default-cidr=$POD_CIDR
           - --default-gateway=$POD_GATEWAY
           - --default-gateway-check=$CHECK_GATEWAY

diff --git a/yamls/kube-ovn-dual-stack.yaml b/yamls/kube-ovn-dual-stack.yaml
@@ -43,9 +43,8 @@ spec:
         - name: kube-ovn-controller
           image: "kubeovn/kube-ovn:v1.9.2"
           imagePullPolicy: IfNotPresent
-          command:
-            - /kube-ovn/start-controller.sh
           args:
+            - /kube-ovn/start-controller.sh
             - --default-cidr=10.16.0.0/16,fd00:10:16::/64
             - --default-gateway=10.16.0.1,fd00:10:16::1
             - --default-gateway-check=true

diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml
@@ -43,9 +43,8 @@ spec:
         - name: kube-ovn-controller
           image: "kubeovn/kube-ovn:v1.9.2"
           imagePullPolicy: IfNotPresent
-          command:
-            - /kube-ovn/start-controller.sh
           args:
+            - /kube-ovn/start-controller.sh
             - --default-cidr=2001:db8:0000:0000::/64
             - --default-gateway=2001:db8:0000:0000::1
             - --default-gateway-check=true

diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
@@ -43,9 +43,8 @@ spec:
         - name: kube-ovn-controller
           image: "kubeovn/kube-ovn:v1.9.2"
           imagePullPolicy: IfNotPresent
-          command:
-            - /kube-ovn/start-controller.sh
           args:
+            - /kube-ovn/start-controller.sh
             - --default-cidr=10.16.0.0/16
             - --default-gateway=10.16.0.1
             - --default-gateway-check=true