diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml index 23020fd75..cc2294c4f 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml @@ -25,6 +25,10 @@ spec: name: whois - containerPort: 30002 name: epp + - containerPort: 30010 + name: http-whois + - containerPort: 30011 + name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml index 922d6a5fa..f17202c2f 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml @@ -25,6 +25,10 @@ spec: name: whois - containerPort: 30002 name: epp + - containerPort: 30010 + name: http-whois + - containerPort: 30011 + name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml index 084b4f174..200ac6c17 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml @@ -25,6 +25,10 @@ spec: name: whois - containerPort: 30002 name: epp + - containerPort: 30010 + name: http-whois + - containerPort: 30011 + name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml index 715810933..796bd0b9e 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml @@ -25,6 +25,10 @@ spec: name: whois - containerPort: 30002 name: epp + - containerPort: 30010 + name: http-whois + - containerPort: 30011 + name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml index f53a19e59..069d04898 100644 --- a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml @@ -25,6 +25,10 @@ spec: name: whois - containerPort: 30002 name: epp + - containerPort: 30010 + name: http-whois + - containerPort: 30011 + name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml b/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml index 5b413cf98..80b149489 100644 --- a/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml @@ -22,6 +22,16 @@ spec: nodePort: 31002 targetPort: epp name: epp + - protocol: TCP + port: 30010 + nodePort: 31010 + targetPort: http-whois + name: http-whois + - protocol: TCP + port: 30011 + nodePort: 31011 + targetPort: https-whois + name: https-whois type: NodePort --- apiVersion: autoscaling/v2beta1 diff --git a/java/google/registry/proxy/kubernetes/proxy-service.yaml b/java/google/registry/proxy/kubernetes/proxy-service.yaml index 57caf4d01..34f37b3fb 100644 --- a/java/google/registry/proxy/kubernetes/proxy-service.yaml +++ b/java/google/registry/proxy/kubernetes/proxy-service.yaml @@ -22,6 +22,16 @@ spec: nodePort: 30002 targetPort: epp name: epp + - protocol: TCP + port: 30010 + nodePort: 30010 + targetPort: http-whois + name: http-whois + - protocol: TCP + port: 30011 + nodePort: 30011 + targetPort: https-whois + name: https-whois type: NodePort --- apiVersion: autoscaling/v2beta1 diff --git a/java/google/registry/proxy/terraform/modules/input.tf b/java/google/registry/proxy/terraform/modules/input.tf index a573fd297..758ce8ab0 100644 --- a/java/google/registry/proxy/terraform/modules/input.tf +++ b/java/google/registry/proxy/terraform/modules/input.tf @@ -28,6 +28,8 @@ variable "proxy_ports" { health_check = 30000 whois = 30001 epp = 30002 + http-whois = 30010 + https-whois = 30011 } } @@ -39,5 +41,7 @@ variable "proxy_ports_canary" { health_check = 31000 whois = 31001 epp = 31002 + http-whois = 31010 + https-whois = 31011 } } diff --git a/java/google/registry/proxy/terraform/update_named_ports.sh b/java/google/registry/proxy/terraform/update_named_ports.sh index 1e368fe30..238417e37 100755 --- a/java/google/registry/proxy/terraform/update_named_ports.sh +++ b/java/google/registry/proxy/terraform/update_named_ports.sh @@ -18,10 +18,13 @@ # the project, zone and instance group names, and then call gcloud to add the # named ports. +PROD_PORTS="whois:30001,epp:30002,http-whois:30010,https-whois:30011" +CANARY_PORTS="whois-canary:31001,epp-canary:31002,"\ +"http-whois-canary:31010,https-whois-canary:31011" + while read line do - gcloud compute instance-groups set-named-ports \ - --named-ports whois:30001,epp:30002,whois-canary:31001,epp-canary:31002 \ - $line + gcloud compute instance-groups set-named-ports --named-ports \ + ${PROD_PORTS},${CANARY_PORTS} $line done < <(terraform output proxy_instance_groups | awk '{print $3}' | \ awk -F '/' '{print "--project", $7, "--zone", $9, $11}')