Skip to content

Commit 79bb74b

Browse files
committed
all: disable unnecessary serving methods
We only need self-signed HTTPS on many services now. For golang/go#49191. Change-Id: I523a98b738f9cca7aeba57f7f6f66c199d99b788 Reviewed-on: https://go-review.googlesource.com/c/build/+/359480 Trust: Heschi Kreinick <[email protected]> Run-TryBot: Heschi Kreinick <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Carlos Amedee <[email protected]>
1 parent e6783b0 commit 79bb74b

File tree

4 files changed

+6
-69
lines changed

4 files changed

+6
-69
lines changed

cmd/coordinator/deployment-prod.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ metadata:
6363
cloud.google.com/app-protocols: '{"https":"HTTP2"}'
6464
spec:
6565
ports:
66-
- port: 80
67-
targetPort: 80
68-
name: http
6966
- port: 444
7067
targetPort: 444
7168
name: https

cmd/gerritbot/deployment-prod.yaml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ spec:
2121
- name: gerritbot
2222
image: gcr.io/symbolic-datum-552/gerritbot:latest
2323
imagePullPolicy: Always
24-
command: ["/sbin/tini", "--", "/gerritbot", "-listen-http=:80", "-listen-https-autocert=:443", "-autocert-bucket=golang-gerritbot-autocert", "-listen-https-selfsigned=:444", "-gitcookies-file=/gitcookies"]
24+
command: ["/sbin/tini", "--", "/gerritbot", "-listen-https-selfsigned=:444", "-gitcookies-file=/gitcookies"]
2525
ports:
26-
- containerPort: 80
2726
- containerPort: 443
2827
resources:
2928
requests:
@@ -36,34 +35,13 @@ spec:
3635
---
3736
apiVersion: v1
3837
kind: Service
39-
metadata:
40-
namespace: prod
41-
name: gerritbot
42-
spec:
43-
ports:
44-
- port: 80
45-
targetPort: 80
46-
name: http
47-
- port: 443
48-
targetPort: 443
49-
name: https
50-
selector:
51-
app: gerritbot
52-
type: LoadBalancer
53-
loadBalancerIP: 35.188.188.192
54-
---
55-
apiVersion: v1
56-
kind: Service
5738
metadata:
5839
namespace: prod
5940
name: gerritbot-internal
6041
annotations:
6142
cloud.google.com/app-protocols: '{"https":"HTTP2"}'
6243
spec:
6344
ports:
64-
- port: 80
65-
targetPort: 80
66-
name: http
6745
- port: 444
6846
targetPort: 444
6947
name: https

devapp/deployment-prod.yaml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ spec:
2121
- name: devapp
2222
image: gcr.io/symbolic-datum-552/devapp:latest
2323
imagePullPolicy: Always
24-
command: ["/devapp", "-listen-http=:80", "-listen-https-autocert=:443", "-autocert-bucket=golang-devapp-autocert", "-listen-https-selfsigned=:444"]
24+
command: ["/devapp", "-listen-https-selfsigned=:444"]
2525
readinessProbe:
2626
httpGet:
2727
path: /healthz
28-
port: 80
28+
port: 444
29+
scheme: HTTPS
2930
ports:
30-
- containerPort: 80
31-
- containerPort: 443
3231
- containerPort: 444
3332
resources:
3433
requests:
@@ -41,24 +40,6 @@ spec:
4140
---
4241
apiVersion: v1
4342
kind: Service
44-
metadata:
45-
namespace: prod
46-
name: devapp
47-
spec:
48-
ports:
49-
- port: 80
50-
targetPort: 80
51-
name: http
52-
- port: 443
53-
targetPort: 443
54-
name: https
55-
selector:
56-
app: devapp
57-
type: LoadBalancer
58-
loadBalancerIP: 35.188.206.122
59-
---
60-
apiVersion: v1
61-
kind: Service
6243
metadata:
6344
namespace: prod
6445
name: devapp-internal-iap

maintner/maintnerd/deployment-prod.yaml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ spec:
2727
- name: maintnerd
2828
image: gcr.io/symbolic-datum-552/maintnerd:latest
2929
imagePullPolicy: Always
30-
command: ["/usr/bin/tini", "--", "/maintnerd", "--config=go", "--bucket=golang-maintner-log", "--verbose", "--data-dir=/cache", "--listen-http=:80", "--listen-https-autocert=:443", "--autocert-bucket=golang-maintner-autocert", "-listen-https-selfsigned=:444"]
30+
command: ["/usr/bin/tini", "--", "/maintnerd", "--config=go", "--bucket=golang-maintner-log", "--verbose", "--data-dir=/cache", "-listen-https-selfsigned=:444"]
3131
volumeMounts:
3232
- mountPath: /cache
3333
name: maintner-cache
3434
ports:
35-
- containerPort: 80
36-
- containerPort: 443
35+
- containerPort: 444
3736
resources:
3837
requests:
3938
cpu: "1"
@@ -56,24 +55,6 @@ spec:
5655
---
5756
apiVersion: v1
5857
kind: Service
59-
metadata:
60-
namespace: prod
61-
name: maintnerd
62-
spec:
63-
ports:
64-
- port: 80
65-
targetPort: 80
66-
name: http
67-
- port: 443
68-
targetPort: 443
69-
name: https
70-
selector:
71-
app: maintnerd
72-
type: LoadBalancer
73-
loadBalancerIP: 35.188.67.38
74-
---
75-
apiVersion: v1
76-
kind: Service
7758
metadata:
7859
namespace: prod
7960
name: maintnerd-internal

0 commit comments

Comments
 (0)