From b17125ae9abb0feade88c9d33d736ebeb0dd25fd Mon Sep 17 00:00:00 2001 From: Pavlo Tkach <3469726+ptkach@users.noreply.github.com> Date: Thu, 17 Apr 2025 11:20:32 -0400 Subject: [PATCH] Disable k8s whois routing (#2740) --- .../gateway/nomulus-route-pubapi.yaml | 18 ------------------ proxy/Dockerfile | 2 +- proxy/kubernetes/proxy-deployment-alpha.yaml | 6 ------ .../proxy-deployment-crash-canary.yaml | 6 ------ proxy/kubernetes/proxy-deployment-crash.yaml | 6 ------ .../proxy-deployment-production-canary.yaml | 6 ------ .../proxy-deployment-production.yaml | 6 ------ .../kubernetes/proxy-deployment-qa-canary.yaml | 6 ------ proxy/kubernetes/proxy-deployment-qa.yaml | 6 ------ .../proxy-deployment-sandbox-canary.yaml | 6 ------ proxy/kubernetes/proxy-deployment-sandbox.yaml | 6 ------ proxy/kubernetes/proxy-service-canary.yaml | 15 --------------- proxy/kubernetes/proxy-service.yaml | 15 --------------- 13 files changed, 1 insertion(+), 103 deletions(-) diff --git a/jetty/kubernetes/gateway/nomulus-route-pubapi.yaml b/jetty/kubernetes/gateway/nomulus-route-pubapi.yaml index 6222929e1..f75ea898d 100644 --- a/jetty/kubernetes/gateway/nomulus-route-pubapi.yaml +++ b/jetty/kubernetes/gateway/nomulus-route-pubapi.yaml @@ -11,15 +11,9 @@ spec: - "pubapi.BASE_DOMAIN" rules: - matches: - - path: - type: PathPrefix - value: /_dr/whois - path: type: PathPrefix value: /check - - path: - type: PathPrefix - value: /whois - path: type: PathPrefix value: /rdap @@ -29,24 +23,12 @@ spec: name: pubapi port: 80 - matches: - - path: - type: PathPrefix - value: /_dr/whois - headers: - - name: "canary" - value: "true" - path: type: PathPrefix value: /check headers: - name: "canary" value: "true" - - path: - type: PathPrefix - value: /whois - headers: - - name: "canary" - value: "true" - path: type: PathPrefix value: /rdap diff --git a/proxy/Dockerfile b/proxy/Dockerfile index 62b53bc79..cb139b309 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -1,4 +1,4 @@ FROM eclipse-temurin:21 ADD build/libs/proxy_server.jar . ENTRYPOINT ["java", "-jar", "proxy_server.jar"] -EXPOSE 30000 30001 30002 30010 30012 +EXPOSE 30000 30002 30012 diff --git a/proxy/kubernetes/proxy-deployment-alpha.yaml b/proxy/kubernetes/proxy-deployment-alpha.yaml index 00a1d3a88..e641e69e7 100644 --- a/proxy/kubernetes/proxy-deployment-alpha.yaml +++ b/proxy/kubernetes/proxy-deployment-alpha.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-crash-canary.yaml b/proxy/kubernetes/proxy-deployment-crash-canary.yaml index 793aaa0f6..0147268ee 100644 --- a/proxy/kubernetes/proxy-deployment-crash-canary.yaml +++ b/proxy/kubernetes/proxy-deployment-crash-canary.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-crash.yaml b/proxy/kubernetes/proxy-deployment-crash.yaml index 61adf3179..5d6dd12b9 100644 --- a/proxy/kubernetes/proxy-deployment-crash.yaml +++ b/proxy/kubernetes/proxy-deployment-crash.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-production-canary.yaml b/proxy/kubernetes/proxy-deployment-production-canary.yaml index 6503591b8..9c04c6b35 100644 --- a/proxy/kubernetes/proxy-deployment-production-canary.yaml +++ b/proxy/kubernetes/proxy-deployment-production-canary.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-production.yaml b/proxy/kubernetes/proxy-deployment-production.yaml index 5bd4f22b2..a42b48b7a 100644 --- a/proxy/kubernetes/proxy-deployment-production.yaml +++ b/proxy/kubernetes/proxy-deployment-production.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-qa-canary.yaml b/proxy/kubernetes/proxy-deployment-qa-canary.yaml index 78971c60d..6accb63de 100644 --- a/proxy/kubernetes/proxy-deployment-qa-canary.yaml +++ b/proxy/kubernetes/proxy-deployment-qa-canary.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-qa.yaml b/proxy/kubernetes/proxy-deployment-qa.yaml index 32047b6d3..684b703e7 100644 --- a/proxy/kubernetes/proxy-deployment-qa.yaml +++ b/proxy/kubernetes/proxy-deployment-qa.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml b/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml index 7f805f3bd..bac5696e7 100644 --- a/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml +++ b/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-deployment-sandbox.yaml b/proxy/kubernetes/proxy-deployment-sandbox.yaml index 16b37d390..4f7dcf03f 100644 --- a/proxy/kubernetes/proxy-deployment-sandbox.yaml +++ b/proxy/kubernetes/proxy-deployment-sandbox.yaml @@ -21,14 +21,8 @@ spec: ports: - containerPort: 30000 name: health-check - - containerPort: 30001 - name: whois - containerPort: 30002 name: epp - - containerPort: 30010 - name: http-whois - - containerPort: 30011 - name: https-whois readinessProbe: tcpSocket: port: health-check diff --git a/proxy/kubernetes/proxy-service-canary.yaml b/proxy/kubernetes/proxy-service-canary.yaml index a3a84b23a..240f7a98f 100644 --- a/proxy/kubernetes/proxy-service-canary.yaml +++ b/proxy/kubernetes/proxy-service-canary.yaml @@ -12,26 +12,11 @@ spec: nodePort: 31000 targetPort: health-check name: health-check - - protocol: TCP - port: 30001 - nodePort: 31001 - targetPort: whois - name: whois - protocol: TCP port: 30002 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/v2 diff --git a/proxy/kubernetes/proxy-service.yaml b/proxy/kubernetes/proxy-service.yaml index da162c83c..ccacf4d77 100644 --- a/proxy/kubernetes/proxy-service.yaml +++ b/proxy/kubernetes/proxy-service.yaml @@ -12,26 +12,11 @@ spec: nodePort: 30000 targetPort: health-check name: health-check - - protocol: TCP - port: 30001 - nodePort: 30001 - targetPort: whois - name: whois - protocol: TCP port: 30002 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/v2