github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Add rollback tool to etcd image

Browse Source
This commit is contained in:
Wojciech Tyczynski 2016-10-10 13:20:50 +02:00
parent 4be6d5e9f2
commit ff1f002f59
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/etcd/Dockerfile
View File

@ -13,8 +13,8 @@
# limitations under the License. # limitations under the License.
FROM BASEIMAGE FROM BASEIMAGE
MAINTAINER Dawn Chen <dawnchen@google.com> MAINTAINER Wojciech Tyczynski <wojtekt@google.com>
EXPOSE 2379 2380 4001 7001 EXPOSE 2379 2380 4001 7001
COPY etcd* etcdctl* /usr/local/bin/ COPY etcd* etcdctl* /usr/local/bin/
COPY migrate-if-needed.sh attachlease /usr/local/bin/ COPY migrate-if-needed.sh attachlease rollback /usr/local/bin/

4
cluster/images/etcd/Makefile
View File

@ -55,6 +55,10 @@ build:
# Compile attachlease # Compile attachlease
docker run -it -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes -v $(TEMP_DIR):/build -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ docker run -it -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes -v $(TEMP_DIR):/build -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \
/bin/bash -c "CGO_ENABLED=0 go build -o /build/attachlease k8s.io/kubernetes/cluster/images/etcd/attachlease" /bin/bash -c "CGO_ENABLED=0 go build -o /build/attachlease k8s.io/kubernetes/cluster/images/etcd/attachlease"
# Compile rollback
docker run -it -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes -v $(TEMP_DIR):/build -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \
/bin/bash -c "CGO_ENABLED=0 go build -o /build/rollback k8s.io/kubernetes/cluster/images/etcd/rollback"
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)

2
cluster/images/etcd/migrate-if-needed.sh
View File

@ -79,7 +79,7 @@ fi
if [ ! -d "${DATA_DIRECTORY}" ]; then if [ ! -d "${DATA_DIRECTORY}" ]; then
mkdir -p "${DATA_DIRECTORY}" mkdir -p "${DATA_DIRECTORY}"
fi fi
if [ ! "$(ls -A ${DATA_DIRECTORY})" ]; then if [ -z "$(ls -A ${DATA_DIRECTORY})" ]; then
echo "${DATA_DIRECTORY} is empty - skipping migration" echo "${DATA_DIRECTORY} is empty - skipping migration"
echo "${TARGET_VERSION}/${TARGET_STORAGE}" > "${DATA_DIRECTORY}/${VERSION_FILE}" echo "${TARGET_VERSION}/${TARGET_STORAGE}" > "${DATA_DIRECTORY}/${VERSION_FILE}"
exit 0 exit 0