Skip to content

Commit e6783b0

Browse files
committed
cmd/coordinator,cmd/gerritbot: use HTTP/2 between LB and app
Also disassociate LE certs we don't need any more. For golang/go#49191. Change-Id: I74acf2f2f52fbf91670d27d91112136450f81944 Reviewed-on: https://go-review.googlesource.com/c/build/+/359479 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 8952556 commit e6783b0

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

cmd/coordinator/deployment-prod.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ spec:
2020
- name: coordinator
2121
image: gcr.io/symbolic-datum-552/coordinator:latest
2222
imagePullPolicy: Always
23-
command: ["/coordinator", "-listen-http=:80", "-listen-https-autocert=:443", "-autocert-bucket=farmer-golang-org-autocert-cache"]
23+
command: ["/coordinator", "-listen-http=:80", "-listen-https-autocert=:443", "-autocert-bucket=farmer-golang-org-autocert-cache", "-listen-https-selfsigned=:444"]
2424
ports:
2525
- containerPort: 80
2626
- containerPort: 443
27+
- containerPort: 444
2728
- containerPort: 2222 # ssh proxy port
2829
- containerPort: 8123 # module proxy port (internal, not accessible directly from public)
2930
resources:
@@ -58,11 +59,16 @@ kind: Service
5859
metadata:
5960
namespace: prod
6061
name: coordinator-internal
62+
annotations:
63+
cloud.google.com/app-protocols: '{"https":"HTTP2"}'
6164
spec:
6265
ports:
6366
- port: 80
6467
targetPort: 80
6568
name: http
69+
- port: 444
70+
targetPort: 444
71+
name: https
6672
selector:
6773
app: coordinator
6874
type: ClusterIP

cmd/gerritbot/deployment-prod.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ 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", "-gitcookies-file=/gitcookies"]
24+
command: ["/sbin/tini", "--", "/gerritbot", "-listen-http=:80", "-listen-https-autocert=:443", "-autocert-bucket=golang-gerritbot-autocert", "-listen-https-selfsigned=:444", "-gitcookies-file=/gitcookies"]
2525
ports:
2626
- containerPort: 80
2727
- containerPort: 443
@@ -57,11 +57,16 @@ kind: Service
5757
metadata:
5858
namespace: prod
5959
name: gerritbot-internal
60+
annotations:
61+
cloud.google.com/app-protocols: '{"https":"HTTP2"}'
6062
spec:
6163
ports:
6264
- port: 80
6365
targetPort: 80
6466
name: http
67+
- port: 444
68+
targetPort: 444
69+
name: https
6570
selector:
6671
app: gerritbot
6772
type: ClusterIP

deploy/build-ingress.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ metadata:
66
annotations:
77
kubernetes.io/ingress.global-static-ip-name: ingress
88
networking.gke.io/managed-certificates: dev-test-cert,build-cert,dev-cert,gerritbot-cert,maintner-cert
9-
# Legacy Let's Encrypt certs.
10-
ingress.gcp.kubernetes.io/pre-shared-cert: build-golang-org,build-golang-org-rsa,dev-golang-org,dev-golang-org-rsa,gerritbot-golang-org,gerritbot-golang-org-rsa,maintner-golang-org,maintner-golang-org-rsa
119
kubernetes.io/ingress.class: "gce"
1210
networking.gke.io/v1beta1.FrontendConfig: build-ingress-frontend
1311
spec:
@@ -38,7 +36,7 @@ spec:
3836
service:
3937
name: coordinator-internal
4038
port:
41-
number: 80
39+
number: 444
4240
- host: dev.golang.org
4341
http:
4442
paths:
@@ -58,7 +56,7 @@ spec:
5856
service:
5957
name: gerritbot-internal
6058
port:
61-
number: 80
59+
number: 444
6260
- host: maintner.golang.org
6361
http:
6462
paths:

0 commit comments

Comments
 (0)