Write GKE metrics with the apprioate labels (#2626)

Also makes preperations to expose the sidecar proxy.

jetty/build.gradle

@@ -111,7 +111,7 @@ tasks.register('deployQueue', Exec) {
 }
 
 tasks.register('deployNomulus', Exec) {
-    dependsOn('pushNomulusImage', 'deployCloudSchedulerAndQueue')
+    dependsOn('pushNomulusImage', ':proxy:pushProxyImage', 'deployCloudSchedulerAndQueue')
     configure verifyDeploymentConfig
     commandLine './deploy-nomulus-for-env.sh', "${rootProject.environment}", "${rootProject.baseDomain}"
 }

jetty/deploy-nomulus-for-env.sh

@@ -36,10 +36,14 @@ do
   do
     sed s/GCP_PROJECT/"${project}"/g "./kubernetes/nomulus-${service}.yaml" | \
     sed s/ENVIRONMENT/"${environment}"/g | \
+    sed s/PROXY_ENV/"${environment}"/g | \
+    sed s/PROXY_NAME/"proxy"/g | \
     kubectl apply -f -
     # canary
     sed s/GCP_PROJECT/"${project}"/g "./kubernetes/nomulus-${service}.yaml" | \
     sed s/ENVIRONMENT/"${environment}"/g | \
+    sed s/PROXY_ENV/"${environment}_canary"/g | \
+    sed s/PROXY_NAME/"proxy-canary"/g | \
     sed s/"${service}"/"${service}-canary"/g | \
     kubectl apply -f -
   done

jetty/gradle.lockfile

@@ -50,32 +50,32 @@ com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.181.0=deploy_ja
 com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2:0.181.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-bigtable-v2:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-compute-v1:1.64.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-compute-v1:1.65.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-datastore-v1:0.112.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-firestore-v1:3.25.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-monitoring-v3:3.49.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-pubsub-v1:1.114.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-pubsublite-v1:1.14.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.54.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.54.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1:2.55.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-secretmanager-v1beta2:2.55.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:6.74.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:6.74.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-spanner-executor-v1:6.74.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-spanner-v1:6.74.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.api.grpc:proto-google-cloud-storage-v2:2.32.1-alpha=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2:2.54.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.144.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.144.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-common-protos:2.49.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api.grpc:proto-google-iam-v1:1.44.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:api-common:2.41.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-grpc:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax-httpjson:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.api:gax:2.58.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-admin-directory:directory_v1-rev20241126-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2:2.55.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta2:0.145.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-cloud-tasks-v2beta3:0.145.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-common-protos:2.50.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api.grpc:proto-google-iam-v1:1.45.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:api-common:2.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-grpc:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax-httpjson:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.api:gax:2.59.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-admin-directory:directory_v1-rev20241210-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-bigquery:v2-rev20240815-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-cloudresourcemanager:v1-rev20240310-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.apis:google-api-services-dataflow:v1b3-rev20241028-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.apis:google-api-services-dataflow:v1b3-rev20241209-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-dns:v1-rev20240719-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-drive:v3-rev20241027-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-gmail:v1-rev20240520-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -88,8 +88,8 @@ com.google.apis:google-api-services-pubsub:v1-rev20220904-2.0.0=deploy_jar,runti
 com.google.apis:google-api-services-sheets:v4-rev20241203-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-sqladmin:v1beta4-rev20240925-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.apis:google-api-services-storage:v1-rev20240706-2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-credentials:1.30.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.auth:google-auth-library-oauth2-http:1.30.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-credentials:1.30.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.auth:google-auth-library-oauth2-http:1.30.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.auto.service:auto-service-annotations:1.1.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.auto.value:auto-value-annotations:1.11.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -105,7 +105,7 @@ com.google.cloud.sql:jdbc-socket-factory-core:1.21.0=deploy_jar,runtimeClasspath
 com.google.cloud.sql:postgres-socket-factory:1.21.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-bigquerystorage:3.9.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-bigtable:2.43.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-compute:1.64.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-compute:1.65.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-grpc:2.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core-http:2.31.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-core:2.42.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -113,10 +113,10 @@ com.google.cloud:google-cloud-firestore:3.25.1=deploy_jar,runtimeClasspath,testR
 com.google.cloud:google-cloud-monitoring:3.49.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-pubsub:1.132.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-pubsublite:1.14.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-secretmanager:2.54.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-secretmanager:2.55.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-spanner:6.74.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:google-cloud-storage:2.32.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.cloud:google-cloud-tasks:2.54.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.cloud:google-cloud-tasks:2.55.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:grpc-gcp:1.6.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.cloud:proto-google-cloud-firestore-bundle-v1:3.25.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,deploy_jar,errorprone,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspath
@@ -146,10 +146,10 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=chec
 com.google.gwt:gwt-user:2.10.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-apache-v2:1.45.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-appengine:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client-gson:1.45.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client-gson:1.45.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-jackson2:1.43.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.http-client:google-http-client-protobuf:1.44.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.http-client:google-http-client:1.45.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.http-client:google-http-client:1.45.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.inject:guice:5.1.0=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.inject:guice:7.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.3=checkstyle
@@ -157,10 +157,10 @@ com.google.j2objc:j2objc-annotations:3.0.0=deploy_jar,runtimeClasspath,testRunti
 com.google.jsinterop:jsinterop-annotations:2.0.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.monitoring-client:metrics:1.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.monitoring-client:stackdriver:1.0.7=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-java6:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-jetty:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client-servlet:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-com.google.oauth-client:google-oauth-client:1.36.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-java6:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-jetty:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client-servlet:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+com.google.oauth-client:google-oauth-client:1.37.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java-util:3.25.5=deploy_jar,runtimeClasspath,testRuntimeClasspath
 com.google.protobuf:protobuf-java:3.19.6=annotationProcessor,errorprone,testAnnotationProcessor
 com.google.protobuf:protobuf-java:3.25.5=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -206,25 +206,24 @@ io.github.classgraph:classgraph:4.8.162=deploy_jar,runtimeClasspath,testRuntimeC
 io.github.eisop:dataflow-errorprone:3.34.0-eisop1=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.12=annotationProcessor,errorprone,testAnnotationProcessor
 io.github.java-diff-utils:java-diff-utils:4.15=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-alts:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-api:1.68.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-auth:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-alts:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-api:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-auth:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-census:1.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-context:1.68.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-core:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-googleapis:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-grpclb:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-inprocess:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-netty-shaded:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-context:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-core:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-googleapis:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-grpclb:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-inprocess:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-netty-shaded:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-netty:1.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-protobuf-lite:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-protobuf:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-protobuf-lite:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-protobuf:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.grpc:grpc-rls:1.66.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-s2a:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-services:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-stub:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-util:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-io.grpc:grpc-xds:1.68.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-services:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-stub:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-util:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+io.grpc:grpc-xds:1.69.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.netty:netty-buffer:4.1.100.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.netty:netty-codec-http2:4.1.100.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath
 io.netty:netty-codec-http:4.1.100.Final=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -322,15 +321,15 @@ org.bouncycastle:bcutil-jdk18on:1.79=deploy_jar,runtimeClasspath,testRuntimeClas
 org.checkerframework:checker-compat-qual:2.5.6=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.12.0=checkstyle
 org.checkerframework:checker-qual:3.33.0=annotationProcessor,errorprone,testAnnotationProcessor
-org.checkerframework:checker-qual:3.47.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.checkerframework:checker-qual:3.48.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.24=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.conscrypt:conscrypt-openjdk-uber:2.5.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.eclipse.angus:angus-activation:2.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.eclipse.angus:jakarta.mail:2.0.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.eclipse.collections:eclipse-collections-api:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.eclipse.collections:eclipse-collections:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.flywaydb:flyway-core:11.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
-org.flywaydb:flyway-database-postgresql:11.0.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.flywaydb:flyway-core:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
+org.flywaydb:flyway-database-postgresql:11.1.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-core:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.glassfish.jaxb:jaxb-runtime:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.glassfish.jaxb:txw2:4.0.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
@@ -389,13 +388,13 @@ org.threeten:threetenbp:1.7.0=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.w3c.css:sac:1.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.4=deploy_jar,runtimeClasspath,testRuntimeClasspath
 org.yaml:snakeyaml:2.3=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler-api:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler-diagram:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler-loader:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler-postgresql:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler-text:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler-tools:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler-utility:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
-us.fatehi:schemacrawler:16.23.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler-api:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler-diagram:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler-loader:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler-postgresql:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler-text:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler-tools:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler-utility:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
+us.fatehi:schemacrawler:16.24.1=deploy_jar,runtimeClasspath,testRuntimeClasspath
 xerces:xmlParserAPIs:2.6.2=deploy_jar,runtimeClasspath,testRuntimeClasspath
 empty=compileClasspath,providedCompile,providedRuntime,testCompileClasspath

jetty/kubernetes/nomulus-backend.yaml

@@ -22,6 +22,17 @@ spec:
           requests:
             cpu: "500m"
         args: [ENVIRONMENT]
+        env:
+        - name: POD_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: NAMESPACE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: CONTAINER_NAME
+          value: backend
 ---
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler

jetty/kubernetes/nomulus-console.yaml

@@ -22,6 +22,17 @@ spec:
           requests:
             cpu: "500m"
         args: [ENVIRONMENT]
+        env:
+        - name: POD_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: NAMESPACE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: CONTAINER_NAME
+          value: console
 ---
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler

jetty/kubernetes/nomulus-frontend.yaml

@@ -22,17 +22,6 @@ spec:
           requests:
             cpu: "500m"
         args: [ENVIRONMENT]
-      - name: proxy
-        image: gcr.io/GCP_PROJECT/proxy
-        ports:
-        - containerPort: 30001
-          name: whois
-        - containerPort: 30002
-          name: epp
-        resources:
-          requests:
-            cpu: "500m"
-        args: [--env, ENVIRONMENT, --log, --local]
         env:
         - name: POD_ID
           valueFrom:
@@ -43,7 +32,27 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: CONTAINER_NAME
-          value: proxy
+          value: frontend
+      - name: PROXY_NAME
+        image: gcr.io/GCP_PROJECT/proxy
+        ports:
+        - containerPort: 30002
+          name: epp
+        resources:
+          requests:
+            cpu: "500m"
+        args: [--env, PROXY_ENV, --log, --local]
+        env:
+        - name: POD_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: NAMESPACE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: CONTAINER_NAME
+          value: PROXY_NAME
 ---
 # Only need to define the service account once per cluster.
 apiVersion: v1
@@ -83,9 +92,6 @@ spec:
     - port: 80
       targetPort: http
       name: http
-    - port: 43
-      targetPort: whois
-      name: whois
     - port: 700
       targetPort: epp
       name: epp

jetty/kubernetes/nomulus-pubapi.yaml

@@ -22,6 +22,37 @@ spec:
           requests:
             cpu: "500m"
         args: [ENVIRONMENT]
+        env:
+        - name: POD_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: NAMESPACE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: CONTAINER_NAME
+          value: pubapi
+      - name: PROXY_NAME
+        image: gcr.io/GCP_PROJECT/proxy
+        ports:
+        - containerPort: 30001
+          name: whois
+        resources:
+          requests:
+            cpu: "500m"
+        args: [ --env, PROXY_ENV, --log, --local ]
+        env:
+        - name: POD_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: NAMESPACE_ID
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: CONTAINER_NAME
+          value: PROXY_NAME
 ---
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
@@ -53,6 +84,9 @@ spec:
     - port: 80
       targetPort: http
       name: http
+    - port: 43
+      targetPort: whois
+      name: whois
 ---
 apiVersion: net.gke.io/v1
 kind: ServiceExport