Skip to content
This repository has been archived by the owner on Nov 29, 2024. It is now read-only.

Fix: error while building loadtest docker server #10 #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: error while building loadtest docker server #10 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc07abf
Error while building loadtest docker server #10: updated go version t…
Oct 9, 2016
6d26ffd
added role in prometheus config
Oct 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/loadtest/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ Now, let's create the Docker images that we will use to run our services. I am a

```console
$ docker build -t gcr.io/google.com/doorman/doorman-server:v0.1.7 doc/loadtest/docker/server/
$ docker build -t gcr.io/google.com/doorman/doorman-client:v0.1.7 doc/loadtest/docker/server/
$ docker build -t gcr.io/google.com/doorman/target:v0.1 doc/loadtest/docker/server/
$ docker build -t gcr.io/google.com/doorman/doorman-client:v0.1.7 doc/loadtest/docker/client/
$ docker build -t gcr.io/google.com/doorman/target:v0.1 doc/loadtest/docker/target/
$ docker build -t gcr.io/google.com/doorman/prometheus:v0.2 doc/loadtest/docker/prometheus
```

Expand Down
2 changes: 1 addition & 1 deletion doc/loadtest/docker/client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.5
FROM golang:1.7
RUN go get "github.com/golang/glog" "github.com/pborman/uuid" "github.com/youtube/doorman/go/client/doorman" \
golang.org/x/net/context google.golang.org/grpc google.golang.org/grpc/examples/helloworld/helloworld \
github.com/youtube/doorman/go/ratelimiter
Expand Down
3 changes: 3 additions & 0 deletions doc/loadtest/docker/prometheus/prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ scrape_configs:
- api_servers:
- 'https://kubernetes.default.svc'
in_cluster: true
role: apiserver

relabel_configs:
- source_labels: [__meta_kubernetes_role]
Expand Down Expand Up @@ -49,6 +50,7 @@ scrape_configs:
- api_servers:
- 'https://kubernetes.default.svc'
in_cluster: true
role: endpoint

relabel_configs:
- source_labels: [__meta_kubernetes_role, __meta_kubernetes_service_annotation_prometheus_io_scrape]
Expand Down Expand Up @@ -95,6 +97,7 @@ scrape_configs:
- api_servers:
- 'https://kubernetes.default.svc'
in_cluster: true
role: service

relabel_configs:
- source_labels: [__meta_kubernetes_role, __meta_kubernetes_service_annotation_prometheus_io_probe]
Expand Down
2 changes: 1 addition & 1 deletion doc/loadtest/docker/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM golang:1.5
FROM golang:1.7
ADD config.yml .
RUN go get github.com/youtube/doorman/go/cmd/doorman
2 changes: 1 addition & 1 deletion doc/loadtest/docker/target/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.5
FROM golang:1.7
RUN go get github.com/golang/glog github.com/prometheus/client_golang/prometheus \
golang.org/x/net/context google.golang.org/grpc \
google.golang.org/grpc/examples/helloworld/helloworld
Expand Down