Merge pull request #23 from STRRL/build-image

feat: makefile to build binary and image at local machine

Author: STRRL

.github/workflows/upload_image.yaml

@@ -7,42 +7,6 @@ on:
     types: [published]
 
 jobs:
-  build-coredns:
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
-    runs-on: ${{ fromJson('{"amd64":"ubuntu-latest", "arm64":["self-hosted", "Linux", "ARM64"]}')[matrix.arch] }}
-
-    container:
-      image: golang:1.13
-
-    steps:
-      - name: Clone CoreDNS
-        run: |
-          apt update -y && apt install git make -y
-
-          git clone https://github.com/coredns/coredns.git .
-          git checkout 7d5f5b87a4fb310d442f7ef0d52e3fead0e10d39
-          sed -i 's/stable/buster/g' Dockerfile
-
-      - uses: actions/checkout@v3
-        with:
-          path: 'plugin/k8s_dns_chaos'
-      
-      - name: Build Chaos CoreDNS
-        run: |
-          echo "k8s_dns_chaos:github.com/chaos-mesh/k8s_dns_chaos" >> plugin.cfg
-          # TODO: replace with the local repo, not stuck with a certain commit
-          go mod edit -require github.com/chaos-mesh/k8s_dns_chaos@649fd5298a454eb59b6080fd670e7f7ea1f5b1b4
-          SWAGGER=1 UI=1 make coredns
-
-      - name: upload coredns binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: coredns-${{ matrix.arch }}
-          path: coredns
-          retention-days: 7
-
   build-docker-image:
     strategy:
       matrix:
@@ -70,29 +34,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Clone CoreDNS
-        run: |
-          apt update -y && apt install git make -y
-
-          git clone https://github.com/coredns/coredns.git .
-          git checkout 7d5f5b87a4fb310d442f7ef0d52e3fead0e10d39
-          sed -i 's/stable/buster/g' Dockerfile
-
-      - name: Download coredns binary
-        uses: actions/download-artifact@v2
-        with:
-          name: coredns-${{ matrix.arch }}
-          path: coredns-artifacts
-
       - name: Build Chaos CoreDNS Image
         env:
           IMAGE_TAG: ${{ steps.image_tag.outputs.image_tag }}
           ARCH: ${{ matrix.arch }}
           GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}
         run: |
-          # permissions would be lost after transfer by github artifacts, see: https://github.com/chaos-mesh/k8s_dns_chaos/issues/20
-          chmod +x coredns-artifacts/coredns
-          mv coredns-artifacts/coredns coredns
           docker build -t ghcr.io/${GITHUB_REPOSITORY_OWNER,,}/chaos-coredns:$IMAGE_TAG-$ARCH .
 
       - name: Upload Chaos CoreDNS

.gitignore

@@ -13,3 +13,6 @@
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+
+# binary artifact
+coredns

Dockerfile

@@ -0,0 +1,21 @@
+# syntax=docker/dockerfile:experimental
+
+FROM golang:1.19 AS build-env
+ENV GO111MODULE on
+WORKDIR /
+RUN git clone --depth 1 --branch v1.7.0 https://github.com/coredns/coredns
+COPY . /k8s_dns_chaos
+RUN ln -s /k8s_dns_chaos /coredns/plugin/k8s_dns_chaos
+RUN echo "k8s_dns_chaos:k8s_dns_chaos" >> plugin.cfg
+RUN cd coredns && make
+
+FROM debian:stable-slim AS certs
+RUN apt-get update && apt-get -uy upgrade
+RUN apt-get -y install ca-certificates && update-ca-certificates
+
+FROM scratch
+LABEL org.opencontainers.image.source=https://github.com/chaos-mesh/k8s_dns_chaos
+COPY --from=certs /etc/ssl/certs /etc/ssl/certs
+COPY --from=build-env /coredns/coredns /coredns
+EXPOSE 53 53/udp
+ENTRYPOINT ["/coredns"]

Makefile

@@ -0,0 +1,19 @@
+.DEFAULT_GOAL:=help
+
+.PHONY: image
+image: ## Build the latest container image
+	DOCKER_BUILDKIT=1 docker build -t ghcr.io/chaos-mesh/chaos-coredns:latest .
+
+.PHONY: coredns
+coredns: image ## Build the coredns executable binary
+	docker container create --name extract-coredns ghcr.io/chaos-mesh/chaos-coredns:latest
+	docker container cp extract-coredns:/coredns ./coredns
+	docker container rm -f extract-coredns
+
+# The help will print out all targets with their descriptions organized bellow their categories. The categories are represented by `##@` and the target descriptions by `##`.
+# The awk commands is responsible to read the entire set of makefiles included in this invocation, looking for lines of the file as xyz: ## something, and then pretty-format the target and help. Then, if there's a line with ##@ something, that gets pretty-printed as a category.
+# More info over the usage of ANSI control characters for terminal formatting: https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters
+# More info over awk command: http://linuxcommand.org/lc3_adv_awk.php
+.PHONY: help
+help:  ## Display this help
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

go.mod

@@ -0,0 +1,65 @@
+module github.com/chaos-mesh/k8s_dns_chaos
+
+go 1.19
+
+require (
+	github.com/caddyserver/caddy v1.0.5
+	github.com/coredns/coredns v1.7.0
+	github.com/golang/protobuf v1.5.2
+	github.com/miekg/dns v1.1.43
+	github.com/pingcap/tidb-tools v6.3.0+incompatible
+	github.com/prometheus/client_golang v1.11.0
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+	google.golang.org/grpc v1.41.0
+	k8s.io/api v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/client-go v0.22.2
+	k8s.io/klog v1.0.0
+)
+
+require (
+	cloud.google.com/go v0.94.1 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/evanphx/json-patch v4.11.0+incompatible // indirect
+	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
+	github.com/go-logr/logr v1.0.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0 // indirect
+	github.com/pingcap/errors v0.11.4 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.31.1 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+	golang.org/x/sys v0.0.0-20210917161153-d61c044b1678 // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	google.golang.org/api v0.58.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/klog/v2 v2.20.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
+	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
+)