update missed and rename service port's name

knative · Sep 1, 2019 · aac0669 · aac0669
1 parent 2b72e37
commit aac0669
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/config/400-activator-service.yaml b/config/400-activator-service.yaml
@@ -32,7 +32,7 @@ spec:
     protocol: TCP
     port: 81
     targetPort: 8013
-  - name: metrics
+  - name: http-metrics
     protocol: TCP
     port: 9090
     targetPort: 9090

diff --git a/config/400-controller-service.yaml b/config/400-controller-service.yaml
@@ -22,7 +22,7 @@ metadata:
   namespace: knative-serving
 spec:
   ports:
-  - name: metrics
+  - name: http-metrics
     port: 9090
     protocol: TCP
     targetPort: 9090

diff --git a/config/autoscaler-service.yaml b/config/autoscaler-service.yaml
@@ -26,7 +26,7 @@ spec:
     port: 8080
     protocol: TCP
     targetPort: 8080
-  - name: metrics
+  - name: http-metrics
     port: 9090
     protocol: TCP
     targetPort: 9090

diff --git a/pkg/apis/serving/v1alpha1/revision_lifecycle.go b/pkg/apis/serving/v1alpha1/revision_lifecycle.go
@@ -52,11 +52,11 @@ const (
 
 	// UserQueueMetricsPortName specifies the port name to use for metrics
 	// emitted by queue-proxy for end user.
-	UserQueueMetricsPortName = "tcp-usermetrics"
+	UserQueueMetricsPortName = "http-usermetric"
 
 	// ServiceQueueMetricsPortName is the name of the port that serves metrics
 	// on the Kubernetes service.
-	ServiceQueueMetricsPortName = "tcp-metrics"
+	ServiceQueueMetricsPortName = "http-metrics"
 )
 
 var revCondSet = apis.NewLivingConditionSet(

diff --git a/pkg/reconciler/autoscaling/resources/service_test.go b/pkg/reconciler/autoscaling/resources/service_test.go
@@ -85,7 +85,7 @@ func TestMakeService(t *testing.T) {
 				},
 				Spec: corev1.ServiceSpec{
 					Ports: []corev1.ServicePort{{
-						Name:       "metrics",
+						Name:       "http-metrics",
 						Protocol:   corev1.ProtocolTCP,
 						Port:       9090,
 						TargetPort: intstr.FromString("queue-metrics"),