Merge pull request #3 from openshift/update-docker-repo

Update docker repo

Dockerfile

@@ -1,14 +1,10 @@
-FROM openshift/origin-base AS build
+FROM openshift/origin-release:golang-1.10 AS builder
 
-ENV GOPATH /go
-RUN mkdir $GOPATH
-RUN yum install -y golang make
-
-COPY . $GOPATH/src/github.com/openshift/prom-label-proxy
-RUN cd $GOPATH/src/github.com/openshift/prom-label-proxy && make build
+COPY . /go/src/github.com/openshift/prom-label-proxy
+RUN cd /go/src/github.com/openshift/prom-label-proxy && make build
 
 FROM openshift/origin-base
-COPY --from=build /go/src/github.com/openshift/prom-label-proxy/_output/linux/amd64/prom-label-proxy /usr/bin/prom-kube-proxy
+COPY --from=builder /go/src/github.com/openshift/prom-label-proxy/_output/linux/amd64/prom-label-proxy /usr/bin/prom-kube-proxy
 
 LABEL io.k8s.display-name="" \
       io.k8s.description="" \

Makefile

@@ -7,7 +7,7 @@ OUT_DIR=_output
 BIN?=prom-label-proxy
 VERSION?=$(shell cat VERSION)
 PKGS=$(shell go list ./... | grep -v /vendor/)
-DOCKER_REPO?=quay.io/openshift/prom-label-proxy
+DOCKER_REPO?=quay.io/coreos/prom-label-proxy
 
 check-license:
 	@echo ">> checking license headers"
@@ -27,6 +27,10 @@ build:
 container:
 	docker build -t $(DOCKER_REPO):$(VERSION) .
 
+run-curl-container:
+	@echo 'Example: curl -v -s -k -H "Authorization: Bearer `cat /var/run/secrets/kubernetes.io/serviceaccount/token`" https://kube-rbac-proxy.default.svc:8443/api/v1/query?query=up\&namespace=default'
+	kubectl run -i -t krp-curl --image=quay.io/brancz/krp-curl:v0.0.1 --restart=Never --command -- /bin/sh
+
 test:
 	@echo ">> running all tests"
 	@go test -i $(PKGS)

examples/deployment.yaml

@@ -49,7 +49,7 @@ kind: ConfigMap
 metadata:
   name: kube-rbac-proxy
 data:
-  resource-attributes.yaml: |+
+  config.yaml: |+
     authorization:
       rewrites:
         byQueryParameter:
@@ -74,11 +74,11 @@ spec:
       serviceAccountName: kube-rbac-proxy
       containers:
       - name: kube-rbac-proxy
-        image: quay.io/brancz/kube-rbac-proxy-dev:v0.3.1-c617c88
+        image: quay.io/brancz/kube-rbac-proxy:v0.4.0
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://localhost:8080/"
-        - "--resource-attributes-file=/etc/kube-rbac-proxy/resource-attributes.yaml"
+        - "--config-file=/etc/kube-rbac-proxy/config.yaml"
         - "--logtostderr=true"
         - "--v=10"
         ports:
@@ -88,7 +88,7 @@ spec:
         - name: config
           mountPath: /etc/kube-rbac-proxy
       - name: prom-label-enforcer
-        image: quay.io/brancz/prom-label-proxy:v0.1.0
+        image: quay.io/coreos/prom-label-proxy:v0.1.0
         imagePullPolicy: Always
         args:
         - "--insecure-listen-address=127.0.0.1:8080"