Merge pull request #79 from chuckha/image-restarting

Fix up image restart process

Author: k8s-ci-robot

Dockerfile

@@ -22,10 +22,10 @@ COPY kubeadm/ kubeadm/
 
 # Allow containerd to restart pods by calling /restart.sh (mostly for tilt + fast dev cycles)
 # TODO: Remove this on prod and use a multi-stage build
-COPY third_party/forked/rerun-process-wrapper/start.sh /start.sh
-COPY third_party/forked/rerun-process-wrapper/restart.sh /restart.sh
+COPY third_party/forked/rerun-process-wrapper/start.sh .
+COPY third_party/forked/rerun-process-wrapper/restart.sh .
 
 # Build and run
 RUN go install -v .
 RUN mv /go/bin/cluster-api-bootstrap-provider-kubeadm /manager
-ENTRYPOINT ["/start.sh", "/manager"]
+ENTRYPOINT ["./start.sh", "/manager"]

config/manager/manager.yaml

@@ -23,9 +23,7 @@ spec:
         control-plane: controller-manager
     spec:
       containers:
-      - command:
-        - /manager
-        args:
+      - args:
         - --enable-leader-election
         image: controller:latest
         imagePullPolicy: Always