Skip to content
This repository has been archived by the owner on May 17, 2023. It is now read-only.

remove repeative log entry #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
NAME := k8s-custom-iptables
SRCS := run.sh

TAG ?= 1.0
REGISTRY=gcr.io/google_containers
TAG ?= 1.2
REGISTRY=bisontrails
IMAGE := $(REGISTRY)/$(NAME):$(TAG)

ifeq ($(REGISTRY),)
Expand All @@ -28,7 +28,7 @@ endif
all: push

push: image
gcloud docker -- push $(IMAGE)
docker -- push $(IMAGE)

image: Dockerfile $(SRCS)
docker build -f Dockerfile -t $(IMAGE) .
Expand Down
3 changes: 1 addition & 2 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ update_nat() {
if ${IPTABLES} -t nat -C POSTROUTING -d ${subnet} \
-m comment --comment "${comment}" -j MASQUERADE -w ${WAIT_INTERVAL}\
2>/dev/null; then
log "NAT rule ${comment} is installed"
return
fi
fi
Expand Down Expand Up @@ -103,4 +102,4 @@ main() {
done
}

main
main