Merge pull request grafana/phlare#89 from grafana/20220715_deploy-main-to-dev

Deploy main image build to dev cluster

Author: simonswine

.github/workflows/test.yml

@@ -79,9 +79,9 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1
       - name: Build image
-        run: make docker-image/fire/build
+        run: make docker-image/fire/build "BUILDX_ARGS=--cache-from=type=gha --cache-to=type=gha"
 
-  build-and-push-image:
+  build-push-and-deploy-image:
     if: github.event_name == 'push' && github.repository == 'grafana/fire'
     runs-on: ubuntu-latest
     steps:
@@ -103,4 +103,12 @@ jobs:
           username: _json_key
           password: ${{ secrets.GCR_JSON_KEY }}
       - name: Build & push multi-arch image
-        run: make docker-image/fire/push IMAGE_PLATFORM=linux/arm64/v8,linux/amd64
+        id: build-push
+        run: |
+          make docker-image/fire/push "BUILDX_ARGS=--cache-from=type=gha --cache-to=type=gha"
+      - name: Deploy to fire-dev-001
+        run: |
+          git config --global url."https://grafanabot:${{ secrets.GRAFANABOT_PAT }}@github.com/grafana/deployment_tools".insteadOf "https://github.com/grafana/deployment_tools"
+          make docker-image/fire/deploy-dev-001
+        env:
+          GITHUB_TOKEN: ${{ secrets.GRAFANABOT_PAT }}

Makefile

@@ -12,6 +12,7 @@ LICENSE_IGNORE := -e /testdata/
 GO_TEST_FLAGS ?= -v -race -cover
 
 IMAGE_PLATFORM = linux/amd64
+BUILDX_ARGS =
 GOPRIVATE=github.com/grafana/frostdb
 
 # Boiler plate for building Docker containers.
@@ -21,10 +22,11 @@ IMAGE_PREFIX ?= us.gcr.io/kubernetes-dev/
 IMAGE_TAG ?= $(shell ./tools/image-tag)
 GIT_REVISION := $(shell git rev-parse --short HEAD)
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+GIT_LAST_COMMIT_DATE := $(shell git log -1 --date=raw --format=%cd | cut -d ' ' -f 1 | xargs -i date -d @{} -u +"%Y-%m-%dT%H:%M:%SZ")
 
 # Build flags
 VPREFIX := github.com/grafana/fire/pkg/util/build
-GO_LDFLAGS   := -X $(VPREFIX).Branch=$(GIT_BRANCH) -X $(VPREFIX).Version=$(IMAGE_TAG) -X $(VPREFIX).Revision=$(GIT_REVISION) -X $(VPREFIX).BuildUser=$(shell whoami)@$(shell hostname) -X $(VPREFIX).BuildDate=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
+GO_LDFLAGS   := -X $(VPREFIX).Branch=$(GIT_BRANCH) -X $(VPREFIX).Version=$(IMAGE_TAG) -X $(VPREFIX).Revision=$(GIT_REVISION) -X $(VPREFIX).BuildDate=$(GIT_LAST_COMMIT_DATE)
 GO_FLAGS     := -ldflags "-extldflags \"-static\" -s -w $(GO_LDFLAGS)" -tags netgo -mod=mod
 
 .PHONY: help
@@ -101,7 +103,7 @@ check/go/mod: go/mod
 
 
 define docker_buildx
-	docker buildx build $(1) --ssh default --platform $(IMAGE_PLATFORM) --build-arg=revision=$(GIT_REVISION) -t $(IMAGE_PREFIX)$(shell basename $(@D)) -t $(IMAGE_PREFIX)$(shell basename $(@D)):$(IMAGE_TAG) -f cmd/$(shell basename $(@D))/Dockerfile .
+	docker buildx build $(1) --ssh default --platform $(IMAGE_PLATFORM) $(BUILDX_ARGS) --build-arg=revision=$(GIT_REVISION) -t $(IMAGE_PREFIX)$(shell basename $(@D)) -t $(IMAGE_PREFIX)$(shell basename $(@D)):$(IMAGE_TAG) -f cmd/$(shell basename $(@D))/Dockerfile .
 endef
 
 define deploy
@@ -121,6 +123,31 @@ docker-image/fire/build:
 docker-image/fire/push:
 	$(call docker_buildx,--push)
 
+define UPDATER_CONFIG_JSON
+{
+  "repo_name": "deployment_tools",
+  "destination_branch": "master",
+  "wait_for_ci": true,
+  "wait_for_ci_branch_prefix": "automation/fire-dev-deploy",
+  "wait_for_ci_timeout": "10m",
+  "wait_for_ci_required_status": [
+    "continuous-integration/drone/push"
+  ],
+  "update_jsonnet_attribute_configs": [
+    {
+      "file_path": "ksonnet/environments/fire/dev-us-central-0.fire-dev-001/images.libsonnet",
+      "jsonnet_key": "fire",
+      "jsonnet_value": "$(IMAGE_PREFIX)fire:$(IMAGE_TAG)"
+    }
+  ]
+}
+endef
+
+.PHONY: docker-image/fire/deploy-dev-001
+docker-image/fire/deploy-dev-001: export CONFIG_JSON:=$(call UPDATER_CONFIG_JSON)
+docker-image/fire/deploy-dev-001: $(BIN)/updater
+	$(BIN)/updater
+
 .PHONY: clean
 clean: ## Delete intermediate build artifacts
 	@# -X only removes untracked files, -d recurses into directories, -f actually removes files/dirs
@@ -174,6 +201,10 @@ $(BIN)/mage: Makefile go.mod
 	@mkdir -p $(@D)
 	GOBIN=$(abspath $(@D)) $(GO) install github.com/magefile/mage@v1.13.0
 
+$(BIN)/updater: Makefile
+	@mkdir -p $(@D)
+	GOBIN=$(abspath $(@D)) GOPRIVATE=github.com/grafana/deployment_tools $(GO) install github.com/grafana/deployment_tools/drone/plugins/cmd/updater@d64d509
+
 KIND_CLUSTER = fire-dev
 
 .PHONY: helm/lint