agentgateway: better defaults in deployment (#12529)

Signed-off-by: John Howard <[email protected]>

Author: howardjohn

internal/kgateway/helm/kgateway/templates/gateway/agent-gateway-deployment.yaml

@@ -18,6 +18,9 @@ spec:
   template:
     metadata:
       annotations:
+        prometheus.io/path: /metrics
+        prometheus.io/port: "15020"
+        prometheus.io/scrape: "true"
       {{- with $gateway.extraPodAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}

pkg/deployer/gateway_parameters.go

@@ -133,6 +133,8 @@ func GetInMemoryGatewayParameters(name string, imageInfo *ImageInfo, gatewayClas
 // set for the agentgateway deployment.
 func defaultAgentgatewayParameters(imageInfo *ImageInfo, omitDefaultSecurityContext bool) *v1alpha1.GatewayParameters {
 	gwp := defaultGatewayParameters(imageInfo, omitDefaultSecurityContext)
+	// Leave unset to allow HPA, etc
+	gwp.Spec.Kube.Deployment.Replicas = nil
 	gwp.Spec.Kube.Agentgateway.Enabled = ptr.To(true)
 	gwp.Spec.Kube.PodTemplate.ReadinessProbe.HTTPGet.Path = "/healthz/ready"
 	gwp.Spec.Kube.PodTemplate.ReadinessProbe.HTTPGet.Port = intstr.FromInt(15021)

test/deployer/testdata/agentgateway-omitdefaultsecuritycontext-out.yaml

@@ -74,7 +74,6 @@ metadata:
     gateway.networking.k8s.io/gateway-class-name: agentgateway
     app.kubernetes.io/managed-by: Helm
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: gw
@@ -83,6 +82,9 @@ spec:
   template:
     metadata:
       annotations:
+        prometheus.io/path: /metrics
+        prometheus.io/port: "15020"
+        prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: gw
         app.kubernetes.io/instance: gw

test/deployer/testdata/agentgateway-omitdefaultsecuritycontext-ref-gwp-on-gw-out.yaml

@@ -74,7 +74,6 @@ metadata:
     gateway.networking.k8s.io/gateway-class-name: agentgateway
     app.kubernetes.io/managed-by: Helm
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: gw
@@ -83,6 +82,9 @@ spec:
   template:
     metadata:
       annotations:
+        prometheus.io/path: /metrics
+        prometheus.io/port: "15020"
+        prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: gw
         app.kubernetes.io/instance: gw

test/deployer/testdata/agentgateway-out.yaml

@@ -74,7 +74,6 @@ metadata:
     gateway.networking.k8s.io/gateway-class-name: agentgateway
     app.kubernetes.io/managed-by: Helm
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: gw
@@ -83,6 +82,9 @@ spec:
   template:
     metadata:
       annotations:
+        prometheus.io/path: /metrics
+        prometheus.io/port: "15020"
+        prometheus.io/scrape: "true"
       labels:
         app.kubernetes.io/name: gw
         app.kubernetes.io/instance: gw