Skip to content

Commit

Permalink
use kustomization.yaml for k8s deps
Browse files Browse the repository at this point in the history
  • Loading branch information
sroettger committed Feb 11, 2020
1 parent 97b4ae5 commit c7cb6cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 2 additions & 8 deletions infrastructure/kctf/base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
#

.PHONY: start stop docker ip status logs ssh ssh-healthcheck port-forward test-docker test-kind test-d4w .test-local clean .deploy .maybe-expose .cluster-config .deployment .secrets .config .healthcheck-secrets .healthcheck-exploit-key-secret .healthcheck-config .FORCE
.PHONY: start stop docker ip status logs ssh ssh-healthcheck port-forward test-docker test-kind test-d4w .test-local clean .deploy .maybe-expose .cluster-config .deployment .healthcheck-secrets .healthcheck-exploit-key-secret .healthcheck-config .FORCE

SHELL := bash
.ONESHELL:
Expand Down Expand Up @@ -112,7 +112,7 @@ clean:
rm -R gen/* || true
rm -R healthcheck/gen/* || true

.deploy: .deployment .secrets .config .healthcheck-secrets .healthcheck-exploit-key-secret .healthcheck-config .cluster-config .maybe-expose
.deploy: .deployment .healthcheck-secrets .healthcheck-exploit-key-secret .healthcheck-config .cluster-config .maybe-expose

.maybe-expose: | .cluster-config
source chal.conf
Expand All @@ -137,12 +137,6 @@ clean:
kubectl set image "deployment/${CHALLENGE_NAME}" "healthcheck=$${HEALTHCHECK_IMAGE}"
fi

.secrets: $(shell find secrets) | .cluster-config
kubectl apply -k secrets

.config: $(shell find config) | .cluster-config
kubectl apply -k config

gen/docker-image: Dockerfile files gen/src $(shell find files) $(shell find secrets) $(shell find config) ../kctf-conf/base/nsjail-docker/gen/docker-image
docker build -t "kctf-chal-${CHALLENGE_NAME}" .
echo $$(docker image ls "kctf-chal-${CHALLENGE_NAME}" -q) > $@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
bases:
- ../../../config
- ../../../secrets
- ../../../../kctf-conf/base/k8s/deployment

commonLabels:
Expand Down

0 comments on commit c7cb6cf

Please sign in to comment.