Skip to content
This repository has been archived by the owner on Mar 28, 2020. It is now read-only.

*: remove backup side car #1630

Merged
merged 2 commits into from
Nov 7, 2017
Merged

*: remove backup side car #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
292ed33
cmd: remove backup sidecar
fanminshi Nov 7, 2017
22ef6a7
hack: remove build for backup sidecar
fanminshi Nov 7, 2017
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
131 changes: 0 additions & 131 deletions cmd/backup/main.go
View file
Open in desktop

This file was deleted.

224 changes: 0 additions & 224 deletions cmd/backup/main_test.go
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions hack/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@ RUN apk add --no-cache ca-certificates
ADD _output/bin/etcd-backup-operator /usr/local/bin/etcd-backup-operator
ADD _output/bin/etcd-restore-operator /usr/local/bin/etcd-restore-operator
ADD _output/bin/etcd-operator /usr/local/bin/etcd-operator
# TODO: remove etcd-backup deprecating etcd-backup sidecar
ADD _output/bin/etcd-backup /usr/local/bin

1 change: 0 additions & 1 deletion hack/build/operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ FROM alpine:3.6
RUN apk add --no-cache ca-certificates

ADD _output/bin/etcd-operator /usr/local/bin
ADD _output/bin/etcd-backup /usr/local/bin

CMD ["etcd-operator"]
1 change: 0 additions & 1 deletion hack/build/operator/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ gitHash="github.com/coreos/etcd-operator/version.GitSHA=${GIT_SHA}"
go_ldflags="-X ${ldKVPairs} -X ${gitHash}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change this script to only do build. Now it also does push.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hongchaodeng do you want me to do the above in this pr or a separate pr?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do it in separate pr.


go_build operator
go_build backup

docker build --tag "${IMAGE}" -f hack/build/operator/Dockerfile . 1>/dev/null
# For gcr users, do "gcloud docker -a" to have access.
Expand Down