Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Service port names should follow istio-naming convention? #5070

Merged
merged 2 commits into from
Nov 15, 2019
Merged

Service port names should follow istio-naming convention? #5070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
479e7af
update service ports name following istio-naming convention - https:/…
iamejboy Aug 5, 2019
2a04b3b
update missed and rename service port's name
iamejboy Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/400-activator-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
protocol: TCP
port: 81
targetPort: 8013
- name: metrics
- name: http-metrics
protocol: TCP
port: 9090
targetPort: 9090
Expand Down
2 changes: 1 addition & 1 deletion config/400-controller-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ metadata:
namespace: knative-serving
spec:
ports:
- name: metrics
- name: http-metrics
port: 9090
protocol: TCP
targetPort: 9090
Expand Down
3 changes: 2 additions & 1 deletion config/400-webhook-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ metadata:
namespace: knative-serving
spec:
ports:
- port: 443
- name: https-webhook
port: 443
targetPort: 8443
selector:
role: webhook
4 changes: 2 additions & 2 deletions config/autoscaler-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ spec:
port: 8080
protocol: TCP
targetPort: 8080
- name: metrics
- name: http-metrics
port: 9090
tcnghia marked this conversation as resolved.
Show resolved Hide resolved
protocol: TCP
targetPort: 9090
- name: custom-metrics
- name: https-custom-metrics
port: 443
protocol: TCP
targetPort: 8443
Expand Down
6 changes: 3 additions & 3 deletions pkg/apis/serving/v1alpha1/revision_lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@ const (

// QueueAdminPortName specifies the port name for
// health check and lifecycle hooks for queue-proxy.
QueueAdminPortName string = "queueadm-port"
QueueAdminPortName string = "http-queueadm"

// AutoscalingQueueMetricsPortName specifies the port name to use for metrics
// emitted by queue-proxy for autoscaler.
AutoscalingQueueMetricsPortName = "queue-metrics"

// UserQueueMetricsPortName specifies the port name to use for metrics
// emitted by queue-proxy for end user.
UserQueueMetricsPortName = "user-metrics"
UserQueueMetricsPortName = "http-usermetric"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mattmoor is this acceptable from an update PoV? I feel like, because these names are used when generating the deployment, we effectively trigger a redeployment when this change is applied after an update.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be able to safely rollout changes to the user Deployment

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @tcnghia

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack. I think this may be ok. Following the conventions may help us avoid strange errors.


// ServiceQueueMetricsPortName is the name of the port that serves metrics
// on the Kubernetes service.
ServiceQueueMetricsPortName = "metrics"
ServiceQueueMetricsPortName = "http-metrics"
)

var revCondSet = apis.NewLivingConditionSet(
Expand Down