Merge current #28 into experiments-autobuild

Author: solsson

README.md

@@ -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
 ```

hooks/build

@@ -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)
@@ -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
@@ -26,7 +37,6 @@ docker build -t $IMAGE_NAME .
 CONTEXTS="
 runtime-nodejs
 runtime-typescript
-specs
 "
 
 PUSH=""
@@ -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
 

runtime-nodejs/kustomize-with-rbac/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+- ../rbac-readonly
+- ../kustomize
+patchesStrategicMerge:
+- specs-serviceaccount.yaml

runtime-nodejs/kustomize-with-rbac/specs-serviceaccount.yaml

@@ -0,0 +1,8 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: specs
+spec:
+  template:
+    spec:
+      serviceAccountName: assert

runtime-nodejs/kustomize/kustomization.yaml

@@ -1,7 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-- ../rbac-readonly
 resources:
 - scrapeable-deployment.yaml
 # TODO if many tests reuse this base, how do we manage podmonitor?

runtime-nodejs/kustomize/scrapeable-deployment.yaml

@@ -12,7 +12,6 @@ spec:
       labels:
         kubernetes-assert: metrics
     spec:
-      serviceAccountName: assert
       containers:
       - name: specs
         # We can't have a tag here because https://kubectl.docs.kubernetes.io/pages/reference/kustomize.html#images won't unset it, and Skaffold required no-tag URLs for build
@@ -38,11 +37,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

specs/Dockerfile

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta4
+apiVersion: skaffold/v2beta15
 kind: Config
 metadata:
   name: assert-specs
@@ -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: {}