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

Commit

Permalink
Merge pull request #296 from jmlrt/fix-typo
Browse files Browse the repository at this point in the history
fix "; \" when there is no additional command in the makefiles
  • Loading branch information
jmlrt authored Sep 20, 2019
2 parents 132bd32 + 6b70cbb commit f0c2658
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions elasticsearch/examples/6.x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-six

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ ; \
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../

restart:
helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ ; \
helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-config

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ ; \
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../

secrets:
kubectl delete secret elastic-config-credentials elastic-config-secret elastic-config-slack elastic-config-custom-path || true
Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/examples/default/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-default

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../ ; \
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../

restart:
helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../ ; \
helm upgrade --set terminationGracePeriod=121 --wait --timeout=600 --install $(RELEASE) ../../

test: install goss

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch/examples/oss/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-oss

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ ; \
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../

test: install goss

Expand Down
4 changes: 2 additions & 2 deletions elasticsearch/examples/security/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ include ../../../helpers/examples.mk
RELEASE := helm-es-security

install:
helm upgrade --wait --timeout=600 --install --values ./security.yml $(RELEASE) ../../ ; \
helm upgrade --wait --timeout=600 --install --values ./security.yml $(RELEASE) ../../

purge:
kubectl delete secrets elastic-credentials elastic-certificates elastic-certificate-pem || true
helm del --purge $(RELEASE)
Expand Down
4 changes: 2 additions & 2 deletions kibana/examples/6.x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ include ../../../helpers/examples.mk
RELEASE := helm-kibana-six

install:
helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../ ; \
helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../

purge:
helm del --purge $(RELEASE)

Expand Down
2 changes: 1 addition & 1 deletion kibana/examples/default/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RELEASE := helm-kibana-default

install:
echo "Goss container: $(GOSS_CONTAINER)"
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../ ; \
helm upgrade --wait --timeout=600 --install $(RELEASE) ../../

test: install goss

Expand Down
6 changes: 3 additions & 3 deletions kibana/examples/oss/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ include ../../../helpers/examples.mk

RELEASE := helm-kibana-oss

install:
helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../ ; \
install:
helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../

test: install goss

purge:
helm del --purge $(RELEASE)
4 changes: 2 additions & 2 deletions kibana/examples/security/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ include ../../../helpers/examples.mk
RELEASE := helm-kibana-security

install:
helm upgrade --wait --timeout=600 --install --values ./security.yml $(RELEASE) ../../ ; \
helm upgrade --wait --timeout=600 --install --values ./security.yml $(RELEASE) ../../

test: secrets install goss

purge:
kubectl delete secret kibana || true
helm del --purge $(RELEASE)
Expand Down

0 comments on commit f0c2658

Please sign in to comment.