Skip to content

Speed up dev loops that involve the assert runtime #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,13 @@ docker-compose -f docker-compose.test.yml up --no-build kubernetes-mixin
Build only:

```
NOPUSH=true IMAGE_NAME=solsson/kubernetes-assert:latest ./hooks/build
NOPUSH=true IMAGE_NAME=builds-registry.ystack.svc.cluster.local/yolean/assert ./hooks/build
```

Integration test:

```
NOPUSH=true IMAGE_NAME=solsson/kubernetes-assert:latest ./hooks/build
docker volume rm kubernetes-monitoring_admin 2> /dev/null || true
./test.sh
```
Expand Down
16 changes: 13 additions & 3 deletions hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
[ -z "$DEBUG" ] || set -x
set -eo pipefail

# Settings
DEFAULT_REGISTRY=builds-registry.ystack.svc.cluster.local
[ -z "$BUILDS_REGISTRY" ] && BUILDS_REGISTRY=$DEFAULT_REGISTRY

[ -z "$IMAGE_NAME" ] && echo "IMAGE_NAME is required" && exit 1;

GIT_STATUS=$(git status --untracked-files=no --porcelain=v2)
Expand All @@ -12,6 +16,13 @@ GIT_STATUS=$(git status --untracked-files=no --porcelain=v2)
echo "------ HOOK START - BUILD -------"
printenv

PREPEND_REGISTRY=""
case $IMAGE_NAME in
solsson/* ) ;;
$BUILDS_REGISTRY* ) PREPEND_REGISTRY="${BUILDS_REGISTRY}/" ;;
*) ;;
esac

function imagename {
buildname=$1
case $IMAGE_NAME in
Expand All @@ -26,7 +37,6 @@ docker build -t $IMAGE_NAME .
CONTEXTS="
runtime-nodejs
runtime-typescript
specs
"

PUSH=""
Expand All @@ -35,8 +45,8 @@ for CONTEXT in $CONTEXTS; do

CONTEXT_IMAGE_NAME=$(imagename $CONTEXT)

docker build -t $CONTEXT_IMAGE_NAME -t yolean/assert-$CONTEXT -t yolean/assert-$CONTEXT:$SOURCE_COMMIT ./$CONTEXT
PUSH="$PUSH $CONTEXT_IMAGE_NAME yolean/assert-$CONTEXT:$SOURCE_COMMIT"
docker build -t $CONTEXT_IMAGE_NAME -t yolean/assert-$CONTEXT -t ${PREPEND_REGISTRY}yolean/assert-$CONTEXT:$SOURCE_COMMIT ./$CONTEXT
PUSH="$PUSH $CONTEXT_IMAGE_NAME ${PREPEND_REGISTRY}yolean/assert-$CONTEXT:$SOURCE_COMMIT"

done

Expand Down
5 changes: 0 additions & 5 deletions runtime-nodejs/kustomize/scrapeable-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.serviceAccountName
- name: ASSERT_IS_DEV
valueFrom:
fieldRef:
# This will be true for run --tail as well but that's also a dev-loop use case
fieldPath: metadata.labels['skaffold.dev/tail']
ports:
- containerPort: 9091
name: assert
Expand Down
9 changes: 0 additions & 9 deletions specs/Dockerfile

This file was deleted.

11 changes: 7 additions & 4 deletions specs/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v2beta4
apiVersion: skaffold/v2beta15
kind: Config
metadata:
name: assert-specs
Expand All @@ -7,13 +7,16 @@ build:
gitCommit:
variant: CommitSha
artifacts:
- image: builds-registry.ystack.svc.cluster.local:80/yolean/assert-specs
- image: builds-registry.ystack.svc.cluster.local/yolean/assert-specs
context: ./
custom:
buildCommand: >-
y-build-like-sync
builds-registry.ystack.svc.cluster.local/yolean/assert-runtime-nodejs:../../kubernetes-assert/runtime-nodejs
sync:
manual:
- src: '**'
dest: /usr/src/specs
kaniko:
reproducible: true
cluster: {}
deploy:
kustomize: {}