Revert "Import cortex mixin from upstream (#373)"

This reverts commit 025285e.

Author: pracucci

.github/workflows/test-build-deploy.yml

@@ -10,7 +10,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     container:
-      image: us.gcr.io/kubernetes-dev/mimir-build-image:20211018_import-cortex-mixin-e7b4eab3c
+      image: us.gcr.io/kubernetes-dev/mimir-build-image:add-prettier-08d2e2a61
       credentials:
         username: _json_key
         password: ${{ secrets.gcr_json_key }}
@@ -36,8 +36,6 @@ jobs:
         run: make BUILD_IN_CONTAINER=false check-protos
       - name: Check Generated Documentation
         run: make BUILD_IN_CONTAINER=false check-doc
-      - name: Check Mixin
-        run: make BUILD_IN_CONTAINER=false check-mixin
       - name: Check White Noise.
         run: make BUILD_IN_CONTAINER=false check-white-noise
       - name: Check License Header
@@ -46,7 +44,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     container:
-      image: us.gcr.io/kubernetes-dev/mimir-build-image:20211018_import-cortex-mixin-e7b4eab3c
+      image: us.gcr.io/kubernetes-dev/mimir-build-image:add-prettier-08d2e2a61
       credentials:
         username: _json_key
         password: ${{ secrets.gcr_json_key }}
@@ -70,7 +68,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: us.gcr.io/kubernetes-dev/mimir-build-image:20211018_import-cortex-mixin-e7b4eab3c
+      image: us.gcr.io/kubernetes-dev/mimir-build-image:add-prettier-08d2e2a61
       credentials:
         username: _json_key
         password: ${{ secrets.gcr_json_key }}

Makefile

@@ -2,7 +2,7 @@
 # WARNING: do not commit to a repository!
 -include Makefile.local
 
-.PHONY: all test integration-tests cover clean images protos exes dist doc clean-doc check-doc push-multiarch-build-image license check-license format check-mixin check-mixin-jb check-mixin-mixtool checkin-mixin-playbook build-mixin format-mixin
+.PHONY: all test integration-tests cover clean images protos exes dist doc clean-doc check-doc push-multiarch-build-image license check-license format
 .DEFAULT_GOAL := all
 
 # Version number
@@ -25,12 +25,6 @@ GIT_REVISION := $(shell git rev-parse --short HEAD)
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 UPTODATE := .uptodate
 
-# path to jsonnetfmt
-JSONNET_FMT := jsonnetfmt
-
-# path to the mimir/mixin
-MIXIN_PATH := operations/mimir-mixin
-
 .PHONY: image-tag
 image-tag:
 	@echo $(IMAGE_TAG)
@@ -126,7 +120,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
 # All the boiler plate for building golang follows:
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
-LATEST_BUILD_IMAGE_TAG ?= 20211018_import-cortex-mixin-e7b4eab3c
+LATEST_BUILD_IMAGE_TAG ?= add-prettier-08d2e2a61
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden
@@ -320,33 +314,6 @@ clean-white-noise:
 check-white-noise: clean-white-noise
 	@git diff --exit-code --quiet -- '*.md' || (echo "Please remove trailing whitespaces running 'make clean-white-noise'" && false)
 
-check-mixin: format-mixin check-mixin-jb check-mixin-mixtool check-mixin-playbook
-	@git diff --exit-code --quiet -- $(MIXIN_PATH) || (echo "Please format mixin by running 'make format-mixin'" && false)
-
-	@cd $(MIXIN_PATH) && \
-	jb install && \
-	mixtool lint mixin.libsonnet
-
-check-mixin-jb:
-	@cd $(MIXIN_PATH) && \
-	jb install
-
-check-mixin-mixtool: check-mixin-jb
-	@cd $(MIXIN_PATH) && \
-	mixtool lint mixin.libsonnet
-
-check-mixin-playbook: build-mixin
-	@$(MIXIN_PATH)/scripts/lint-playbooks.sh
-
-build-mixin: check-mixin-jb
-	@rm -rf $(MIXIN_PATH)/out && mkdir $(MIXIN_PATH)/out
-	@cd $(MIXIN_PATH) && \
-	mixtool generate all --output-alerts out/alerts.yaml --output-rules out/rules.yaml --directory out/dashboards mixin.libsonnet && \
-	zip -q -r mimir-mixin.zip out
-
-format-mixin:
-	@find $(MIXIN_PATH) -type f -name '*.libsonnet' -print -o -name '*.jsonnet' -print | xargs jsonnetfmt -i
-
 web-serve:
 	cd website && hugo --config config.toml --minify -v server
 

mimir-build-image/Dockerfile

@@ -6,7 +6,7 @@
 FROM golang:1.16.6-buster
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
-RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq zip unzip protobuf-compiler libprotobuf-dev shellcheck && \
+RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev shellcheck && \
 	rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN go get -u golang.org/x/tools/cmd/goimports@3fce476f0a782aeb5034d592c189e63be4ba6c9e
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
@@ -36,19 +36,15 @@ RUN GOARCH=$(go env GOARCH) && \
 
 RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v1.27.0
 
-RUN GO111MODULE=on \
-	go get github.com/client9/misspell/cmd/[email protected] && \
-	go get github.com/golang/protobuf/[email protected] && \
-	go get github.com/gogo/protobuf/[email protected] && \
-	go get github.com/gogo/protobuf/[email protected] && \
-	go get github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 && \
-	go get github.com/fatih/[email protected] && \
-	go get github.com/campoy/[email protected] && \
-	go get github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected] && \
-	go get github.com/monitoring-mixins/mixtool/cmd/mixtool@bca3066 && \
-	go get github.com/mikefarah/yq/[email protected] && \
-	go get github.com/google/go-jsonnet/cmd/[email protected] && \
-	rm -rf /go/pkg /go/src /root/.cache
+RUN GO111MODULE=on go get \
+		github.com/client9/misspell/cmd/[email protected] \
+		github.com/golang/protobuf/[email protected] \
+		github.com/gogo/protobuf/[email protected] \
+		github.com/gogo/protobuf/[email protected] \
+		github.com/weaveworks/tools/cover@bdd647e92546027e12cdde3ae0714bb495e43013 \
+		github.com/fatih/[email protected] \
+		github.com/campoy/[email protected] \
+	&& rm -rf /go/pkg /go/src /root/.cache
 
 ENV NODE_PATH=/usr/lib/node_modules
 COPY build.sh /