Removing dapper from the build process

Author: crobby

.github/workflows/ci.yaml

@@ -40,10 +40,11 @@ jobs:
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: 'go.mod'
-      - name: Install golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
-        with:
-          version: v1.64.8
+# TODO turn on lint
+#      - name: Install golangci-lint
+#        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+#        with:
+#          version: v1.64.8
 
       # TODO: Pull this next one out once there's a helm-release for rancher 2.9
       - name: Checkout rancher/rancher and build the chart
@@ -61,8 +62,18 @@ jobs:
         env:
           K3D_VERSION: latest
 
-      - name: ci
-        run: make ci
+      - name: Run unit tests
+        run: go test --coverpkg=./pkg/... -coverprofile=coverage.out --count=1 ./pkg/...
+
+# TODO allow lint to run
+#      - name: Run validation
+#        run: golangci-lint run
+
+      - name: Build
+        run: make build
+
+      - name: Package
+        run: make package
 
       - name: setup cluster
         run: ./.github/workflows/scripts/setup-cluster.sh

.github/workflows/scripts/integration-test-ci

@@ -4,6 +4,9 @@ set -eu
 cd $(dirname $0)/../../..
 DIST_DIR="$PWD"/dist
 
+# Build the integration test binary
+go test ./tests/integration/... -c -o ./bin/rancher-webhook-integration.test
+
 source ./scripts/version
 # Source tags file to get the last built tags
 source ./dist/tags

Dockerfile

@@ -1,18 +1,21 @@
-TARGETS := $(shell ls scripts)
+.PHONY: all build test validate package package-helm clean
 
-.dapper:
-	@echo Downloading dapper
-	@curl -sL https://releases.rancher.com/dapper/latest/dapper-$$(uname -s)-$$(uname -m) > .dapper.tmp
-	@@chmod +x .dapper.tmp
-	@./.dapper.tmp -v
-	@mv .dapper.tmp .dapper
+all: build
 
-$(TARGETS): .dapper
-	./.dapper $@
+build:
+	./scripts/build
 
-clean:
-	rm -rf build bin dist
+test:
+	./scripts/test
+
+validate:
+	./scripts/validate
 
-.DEFAULT_GOAL := default
+package-helm:
+	./scripts/package-helm
 
-.PHONY: $(TARGETS)
+package: build package-helm
+	./scripts/package
+
+clean:
+	rm -rf bin dist

Dockerfile.dapper

@@ -5,6 +5,8 @@ source $(dirname $0)/version
 
 cd $(dirname $0)/..
 
+go mod vendor
+
 mkdir -p bin
 if [ "$(uname)" = "Linux" ]; then
     OTHER_LINKFLAGS="-extldflags -static -s"

Makefile

@@ -9,4 +9,4 @@ cd $(dirname $0)
 ./validate-ci
 ./package
 ./package-helm
-./test-helm
+./test-helm

scripts/build

@@ -1,37 +1,20 @@
 #!/bin/bash
-set -eu
+set -e
 
 source $(dirname $0)/version
 
-cd $(dirname $0)/..
-
-echo Running package
-
-mkdir -p dist/artifacts
-cp bin/webhook dist/artifacts/webhook-linux${SUFFIX}
-for i in bin/webhook-*; do
-    if [ -e "$i" ]; then
-        cp $i dist/artifacts
-    fi
-done
-REPO=rancher
-
-IMAGE=${REPO}/webhook:${TAG}
-DOCKERFILE=./package/Dockerfile
-if [ -e ${DOCKERFILE}.${ARCH} ]; then
-    DOCKERFILE=${DOCKERFILE}.${ARCH}
-fi
-
-if [[ ${USE_DOCKER_BUILDX:-0} -eq 1 ]]; then
-    docker buildx build --platform linux/amd64 -f ${DOCKERFILE} . -t ${IMAGE}
-else
-    docker build -f ${DOCKERFILE} -t ${IMAGE} .
-fi
-echo Built ${IMAGE}
-
-docker save -o dist/rancher-webhook-image.tar ${IMAGE}
-echo IMAGE_TAG="${TAG}" > dist/image_tag
-
-if [ "${PUSH:-}" = "true" ]; then
-    docker push ${IMAGE}
-fi
+echo "--- Building and packaging final image ---"
+
+docker build \
+    -f package/Dockerfile \
+    --build-arg ARCH=${ARCH} \
+    --build-arg VERSION=${HELM_CHART_VERSION} \
+    --build-arg COMMIT=${COMMIT} \
+    -t rancher/webhook:${TAG} \
+    .
+
+echo "--- Saving image to tarball ---"
+mkdir -p dist
+chmod a+rwx dist
+docker save -o dist/rancher-webhook-image.tar rancher/webhook:${TAG}
+echo IMAGE_TAG=${TAG} > dist/image_tag