Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Fix up image restart process #79

Merged
merged 1 commit into from
Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 1 addition & 3 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ spec:
control-plane: controller-manager
spec:
containers:
- command:
- /manager
args:
- args:
- --enable-leader-election
image: controller:latest
imagePullPolicy: Always
Expand Down