Reorganize using a Skaffold multi-config setup (#65)

Using Skaffold multi-config allows working on individual language runtimes independently.

Author: briandealwis

.travis.yml

@@ -1,6 +1,8 @@
 sudo: false
 dist: bionic
-lang: bash
+language: go
+go: "1.15.x"
+
 services:
   - docker
 
@@ -10,14 +12,16 @@ before_install:
 
 install: 
   - mkdir -p $HOME/bin
-  - curl -Lo $HOME/bin/skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-amd64
+  - curl -Lo $HOME/bin/skaffold https://storage.googleapis.com/skaffold/builds/latest/skaffold-linux-amd64
   - curl -Lo $HOME/bin/container-structure-test https://storage.googleapis.com/container-structure-test/latest/container-structure-test-linux-amd64
   - curl -Lo $HOME/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.9.0/kind-linux-amd64
   - curl -Lo $HOME/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl
   - chmod +x $HOME/bin/*
   - export PATH=$HOME/bin:$PATH
 
 script:
+  - (cd nodejs/helper-image; go test .)
+  # try building before integration tests
   - skaffold build -p local
 
   # Create a kind configuration to use the docker daemon's configured

buildx.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Skaffold Custom Builder that uses `docker buildx` to perform a
+# multi-platform build.
+
+PLATFORMS=linux/amd64,linux/arm64
+
+if ! docker buildx inspect skaffold-builder >/dev/null 2>&1; then
+  echo ">> creating "docker buildx" builder 'skaffold-builder'"
+  docker buildx create --name skaffold-builder --platform $PLATFORMS
+fi
+
+loadOrPush=$(if [ "$PUSH_IMAGE" = true ]; then echo --platform $PLATFORMS --push; else echo --load; fi)
+
+set -x
+docker buildx build \
+  --progress=plain \
+  --builder skaffold-builder \
+  $loadOrPush \
+  --tag $IMAGE \
+  "$BUILD_CONTEXT"
+

go/Dockerfile go/helper-image/Dockerfile

@@ -0,0 +1,103 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: go
+
+requires:
+  - path: ../integration
+    activeProfiles:
+     - name: integration
+       activatedBy: [integration]
+
+build:
+  local:
+    useBuildkit: true
+  artifacts:
+  - image: skaffold-debug-go
+    context: helper-image
+    custom:
+      buildCommand: ../../buildx.sh
+
+test:
+  - image: skaffold-debug-go
+    structureTests: [structure-tests-go.yaml]
+
+deploy:
+  logs:
+    prefix: auto
+  kubectl:
+    manifests: []   # overwritten in integration profile
+
+profiles:
+
+  # local: never push to remote registries
+  - name: local
+    build:
+      local:
+        push: false
+
+  # integration: set of `skaffold debug`-like integration tests
+  - name: integration
+    patches:
+      - op: add
+        path: /build/artifacts/-
+        value:
+          image: go113app
+          context: test/goapp
+          docker:
+            buildArgs:
+              GOVERSION: 1.13
+      - op: add
+        path: /build/artifacts/-
+        value:
+          image: go114app
+          context: test/goapp
+          docker:
+            buildArgs:
+              GOVERSION: 1.14
+      - op: add
+        path: /build/artifacts/-
+        value:
+          image: go115app
+          context: test/goapp
+          docker:
+            buildArgs:
+              GOVERSION: 1.15
+      - op: add
+        path: /build/artifacts/-
+        value:
+          image: go116app
+          context: test/goapp
+          docker:
+            buildArgs:
+              GOVERSION: 1.16
+    deploy:
+      kubectl:
+        manifests:
+          - test/k8s-test-go113.yaml
+          - test/k8s-test-go114.yaml
+          - test/k8s-test-go115.yaml
+          - test/k8s-test-go116.yaml
+
+  # release: pushes images to production with :latest
+  - name: release
+    build:
+      local:
+        push: true
+      tagPolicy:
+        sha256: {}
+
+  # deprecated-names: use short (deprecated) image names: images were
+  # prefixed with `skaffold-debug-`  so they were more easily distinguished
+  # from other images with similar names.
+  - name: deprecated-names
+    patches:
+      - op: replace
+        path: /build/artifacts/0/image
+        from: skaffold-debug-go
+        value: go
+      - op: replace
+        path: /test/0/image
+        from: skaffold-debug-go
+        value: go
+

go/delve-only-same-user.patch go/helper-image/delve-only-same-user.patch

@@ -0,0 +1,30 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: integration
+
+build:
+  local:
+    useBuildkit: true
+
+deploy:
+  logs:
+    prefix: auto
+  kubectl:
+    manifests: []
+
+profiles:
+  # integration: set of `skaffold debug`-like integration tests
+  - name: integration
+    build:
+      artifacts:
+      - image: kubectl
+        context: kubectl
+        docker:
+          buildArgs:
+            GOVERSION: 1.16
+    deploy:
+      kubectl:
+        manifests:
+          - k8s-rbac.yaml
+

go/install.sh go/helper-image/install.sh

@@ -0,0 +1,63 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: netcore
+
+requires:
+  - path: ../integration
+    activeProfiles:
+     - name: integration
+       activatedBy: [integration]
+
+build:
+  local:
+    useBuildkit: true
+  artifacts:
+  - image: skaffold-debug-netcore
+    context: helper-image
+    custom:
+      buildCommand: ../../buildx.sh
+
+test:
+  - image: skaffold-debug-netcore
+    structureTests: [structure-tests-netcore.yaml]
+
+deploy:
+  logs:
+    prefix: auto
+  kubectl:
+    manifests: []
+
+profiles:
+
+  # local: never push to remote registries
+  - name: local
+    build:
+      local:
+        push: false
+
+  # integration: set of `skaffold debug`-like integration tests
+  - name: integration
+    # No integration tests for netcore yet
+
+  # release: pushes images to production with :latest
+  - name: release
+    build:
+      local:
+        push: true
+      tagPolicy:
+        sha256: {}
+
+  # deprecated-names: use short (deprecated) image names: images were
+  # prefixed with `skaffold-debug-`  so they were more easily distinguished
+  # from other images with similar names.
+  - name: deprecated-names
+    patches:
+      - op: replace
+        path: /build/artifacts/0/image
+        from: skaffold-debug-netcore
+        value: netcore
+      - op: replace
+        path: /test/0/image
+        from: skaffold-debug-netcore
+        value: netcore

go/skaffold.yaml

@@ -0,0 +1,81 @@
+apiVersion: skaffold/v2beta13
+kind: Config
+metadata:
+  name: nodejs
+
+requires:
+  - path: ../integration
+    activeProfiles:
+     - name: integration
+       activatedBy: [integration]
+
+build:
+  local:
+    useBuildkit: true
+  artifacts:
+  - image: skaffold-debug-nodejs
+    context: helper-image
+    custom:
+      buildCommand: ../../buildx.sh
+
+test:
+  - image: skaffold-debug-nodejs
+    structureTests: [structure-tests-nodejs.yaml]
+    # Disabled custom test pending Skaffold #5665 and #5666
+    ##custom:
+    ##  - command: "cd helper-image; go test ."
+    ##    dependencies:
+    ##      paths: ["helper-image/*.go", "helper-image/go.*"]
+
+deploy:
+  logs:
+    prefix: auto
+  kubectl:
+    manifests: []
+
+profiles:
+
+  # local: never push to remote registries
+  - name: local
+    build:
+      local:
+        push: false
+
+  # integration: set of `skaffold debug`-like integration tests
+  - name: integration
+    patches:
+      - op: add
+        path: /build/artifacts/-
+        value:
+          image: nodejs12app
+          context: test/nodejsapp
+          docker:
+            buildArgs:
+              NODEVERSION: 12.16.0
+    deploy:
+      kubectl:
+        manifests:
+          - test/k8s-test-nodejs12.yaml
+
+  # release: pushes images to production with :latest
+  - name: release
+    build:
+      local:
+        push: true
+      tagPolicy:
+        sha256: {}
+
+  # deprecated-names: use short (deprecated) image names: images were
+  # prefixed with `skaffold-debug-`  so they were more easily distinguished
+  # from other images with similar names.
+  - name: deprecated-names
+    patches:
+      - op: replace
+        path: /build/artifacts/0/image
+        from: skaffold-debug-nodejs
+        value: nodejs
+      - op: replace
+        path: /test/0/image
+        from: skaffold-debug-nodejs
+        value: nodejs
+

test/structure-tests-go.yaml go/structure-tests-go.yaml

@@ -6,13 +6,13 @@ set -eu
 # https://github.com/GoogleContainerTools/skaffold/issues/5504
 
 # publish with longer image names
-skaffold build -p prod --default-repo gcr.io/k8s-skaffold/skaffold-debug-support --cache-artifacts=false
-skaffold build -p prod --default-repo gcr.io/gcp-dev-tools/duct-tape
+skaffold build -p release --default-repo gcr.io/k8s-skaffold/skaffold-debug-support --cache-artifacts=false
+skaffold build -p release --default-repo gcr.io/gcp-dev-tools/duct-tape
 
 # the github project packages is a backup location; will need to
 # migrate to ghcr.io/googlecontainertools at some point
-skaffold build -p prod --default-repo docker.pkg.github.com/googlecontainertools/skaffold
+skaffold build -p release --default-repo docker.pkg.github.com/googlecontainertools/skaffold
 
 # publish with shorter (deprecated) image names
-skaffold build -p prod,deprecated-names --default-repo gcr.io/k8s-skaffold/skaffold-debug-support
-skaffold build -p prod,deprecated-names --default-repo gcr.io/gcp-dev-tools/duct-tape
+skaffold build -p release,deprecated-names --default-repo gcr.io/k8s-skaffold/skaffold-debug-support
+skaffold build -p release,deprecated-names --default-repo gcr.io/gcp-dev-tools/duct-tape