From d8eb2b77df88771e7f8c9eab65564f3fa272b8d9 Mon Sep 17 00:00:00 2001
From: Ruben Vargas <ruben.vp8510@gmail.com>
Date: Thu, 9 Sep 2021 22:43:39 -0500
Subject: [PATCH] Use es-rollover golang implementation

Signed-off-by: Ruben Vargas <ruben.vp8510@gmail.com>
---
 Makefile                   | 14 ++++++++------
 cmd/es-rollover/Dockerfile |  6 ++++++
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 cmd/es-rollover/Dockerfile

diff --git a/Makefile b/Makefile
index bbf743d7cd6..a282857fb2f 100644
--- a/Makefile
+++ b/Makefile
@@ -109,10 +109,6 @@ grpc-plugin-storage-integration-test:
 	(cd examples/memstore-plugin/ && go build .)
 	STORAGE=grpc-plugin $(MAKE) storage-integration-test
 
-.PHONY: test-compile-es-scripts
-test-compile-es-scripts:
-	docker run --rm -v ${PWD}:/tmp/jaeger python:3-alpine3.11 /usr/local/bin/python -m py_compile /tmp/jaeger/plugin/storage/es/esRollover.py
-
 .PHONY: index-cleaner-integration-test
 index-cleaner-integration-test: docker-images-elastic
 	# Expire test results for storage integration tests since the environment might change
@@ -188,6 +184,10 @@ build-esmapping-generator-linux:
 build-es-index-cleaner:
 	$(GOBUILD) -o ./cmd/es-index-cleaner/es-index-cleaner-$(GOOS)-$(GOARCH) ./cmd/es-index-cleaner/main.go
 
+.PHONY: build-es-rollover
+build-es-rollover:
+	$(GOBUILD) -o ./cmd/es-rollover/es-rollover-$(GOOS)-$(GOARCH) ./cmd/es-rollover/main.go
+
 .PHONY: docker-hotrod
 docker-hotrod:
 	GOOS=linux $(MAKE) build-examples
@@ -279,7 +279,8 @@ build-platform-binaries: build-agent \
 	build-tracegen \
 	build-anonymizer \
 	build-esmapping-generator \
-	build-es-index-cleaner
+	build-es-index-cleaner \
+	build-es-rollover
 
 .PHONY: build-all-platforms
 build-all-platforms: build-binaries-linux build-binaries-windows build-binaries-darwin build-binaries-s390x build-binaries-arm64 build-binaries-ppc64le
@@ -293,8 +294,9 @@ docker-images-cassandra:
 docker-images-elastic: create-baseimg
 	GOOS=linux GOARCH=$(GOARCH) $(MAKE) build-esmapping-generator
 	GOOS=linux GOARCH=$(GOARCH) $(MAKE) build-es-index-cleaner
+	GOOS=linux GOARCH=$(GOARCH) $(MAKE) build-es-rollover
 	docker build -t $(DOCKER_NAMESPACE)/jaeger-es-index-cleaner:${DOCKER_TAG} --build-arg base_image=$(BASE_IMAGE) --build-arg TARGETARCH=$(GOARCH) cmd/es-index-cleaner
-	docker build -t $(DOCKER_NAMESPACE)/jaeger-es-rollover:${DOCKER_TAG} plugin/storage/es -f plugin/storage/es/Dockerfile.rollover --build-arg TARGETARCH=$(GOARCH)
+	docker build -t $(DOCKER_NAMESPACE)/jaeger-es-rollover:${DOCKER_TAG} --build-arg base_image=$(BASE_IMAGE) --build-arg TARGETARCH=$(GOARCH) cmd/es-rollover
 	@echo "Finished building jaeger-es-indices-clean =============="
 
 docker-images-jaeger-backend: TARGET = release
diff --git a/cmd/es-rollover/Dockerfile b/cmd/es-rollover/Dockerfile
new file mode 100644
index 00000000000..83a3df6ca09
--- /dev/null
+++ b/cmd/es-rollover/Dockerfile
@@ -0,0 +1,6 @@
+ARG base_image
+
+FROM $base_image AS release
+ARG TARGETARCH
+COPY es-rollover-linux-$TARGETARCH /go/bin/es-rollover
+ENTRYPOINT ["/go/bin/es-rollover"]