Update heathz paths

google · Jan 16, 2020 · 66e1675 · 66e1675
1 parent da38eb4
commit 66e1675
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/cmd/keytransparency-monitor/Dockerfile b/cmd/keytransparency-monitor/Dockerfile
@@ -15,6 +15,7 @@ COPY --from=build /go/bin/keytransparency-monitor /
 COPY --from=build /go/bin/healthcheck /
 
 ENTRYPOINT ["/keytransparency-monitor"]
-HEALTHCHECK CMD ["/healthcheck","https://localhost:8099/healthz"]
+HEALTHCHECK CMD ["/healthcheck","http://localhost:8071/healthz"]
 
-EXPOSE 8099
+EXPOSE 8070
+EXPOSE 8071
diff --git a/cmd/keytransparency-monitor/main.go b/cmd/keytransparency-monitor/main.go
@@ -43,8 +43,8 @@ import (
 )
 
 var (
-	addr        = flag.String("addr", ":8090", "The ip:port combination to listen on")
-	metricsAddr = flag.String("metrics-addr", ":8091", "The ip:port to publish metrics on")
+	addr        = flag.String("addr", ":8070", "The ip:port combination to listen on")
+	metricsAddr = flag.String("metrics-addr", ":8071", "The ip:port to publish metrics on")
 	keyFile     = flag.String("tls-key", "genfiles/server.key", "TLS private key file")
 	certFile    = flag.String("tls-cert", "genfiles/server.pem", "TLS cert file")
 

diff --git a/deploy/kubernetes/base/monitor-deployment.yaml b/deploy/kubernetes/base/monitor-deployment.yaml
@@ -20,7 +20,8 @@ spec:
       containers:
       - command:
         - /keytransparency-monitor
-        - --addr=0.0.0.0:8099
+        - --addr=0.0.0.0:8070
+        - --metrics-addr=0.0.0.0:8071
         - --kt-url=server:443
         - --insecure
         - --directoryid=default
@@ -34,16 +35,17 @@ spec:
         livenessProbe:
          httpGet:
            path: /healthz
-           port: 8099
-           scheme: HTTPS
+           port: 8071
+           scheme: HTTP
         readinessProbe:
          httpGet:
            path: /readyz
-           port: 8099
-           scheme: HTTPS
+           port: 8071
+           scheme: HTTP
         name: monitor
         ports:
-        - containerPort: 8099
+        - containerPort: 8070
+        - containerPort: 8071
         resources: {}
         volumeMounts:
         - name: secrets

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -128,7 +128,8 @@ services:
       - sequencer
     image: gcr.io/key-transparency/keytransparency-monitor:${TRAVIS_COMMIT}
     command:
-      - --addr=0.0.0.0:8099
+      - --addr=0.0.0.0:8070
+      - --metrics-addr=0.0.0.0:8071
       - --kt-url=server:8080
       - --insecure
       - --directoryid=default
@@ -139,7 +140,8 @@ services:
       - --alsologtostderr
       - --v=3
     ports:
-    - "8099:8099" # gRPC / HTTPS
+    - "8070:8070" # gRPC / HTTPS
+    - "8071:8071" # HTTP metrics
     secrets:
       - server.key
       - server.crt