Use openshift upstream code instead of having it copy pasted

k8spin · Feb 8, 2021 · 670f181 · 670f181
1 parent 2d4c781
commit 670f181
Show file tree

Hide file tree

Showing 5 changed files with 685 additions and 178 deletions.
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
@@ -14,7 +14,6 @@ WORKDIR /go/src/github.com/k8spin/prometheus-multi-tenant-proxy
 COPY go.mod go.mod
 COPY go.sum go.sum
 COPY cmd cmd
-COPY pkg pkg
 COPY internal internal
 
 RUN cd cmd/prometheus-multi-tenant-proxy && \

diff --git a/go.mod b/go.mod
@@ -2,8 +2,11 @@ module github.com/k8spin/prometheus-multi-tenant-proxy
 
 go 1.15
 
+replace github.com/openshift/prom-label-proxy => github.com/prometheus-community/prom-label-proxy v0.2.1-0.20210129135803-4c30ca94e827
+
 require (
-	github.com/prometheus/prometheus v1.8.2-0.20200106144642-d9613e5c466c
+	github.com/openshift/prom-label-proxy v0.1.1-0.20201207234304-88d4df554125
+	github.com/prometheus/prometheus v1.8.2-0.20200507164740-ecee9c8abfd1
 	github.com/urfave/cli/v2 v2.3.0
 	gopkg.in/yaml.v2 v2.4.0
 )