Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 pkg/autoscaler/metrics/stats_scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func (s *serviceScraper) Scrape(window time.Duration) (stat Stat, err error) {
return
}
scrapeTime := s.clock.Since(startTime)
scrapeTimeSec := float64(scrapeTime / time.Second)
scrapeTimeSec := scrapeTime.Seconds()
s.duration.Record(context.Background(), scrapeTimeSec, metric.WithAttributeSet(s.attrs))
}()

Expand Down
3 changes: 1 addition & 2 deletions pkg/queue/request_metric.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package queue

import (
"net/http"
"time"

"go.opentelemetry.io/otel/metric"
semconv "go.opentelemetry.io/otel/semconv/v1.34.0"
Expand Down Expand Up @@ -103,7 +102,7 @@ func (h *appRequestMetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ
status = http.StatusInternalServerError
}

elapsedTime := float64(latency / time.Second)
elapsedTime := latency.Seconds()
h.duration.Record(r.Context(), elapsedTime,
metric.WithAttributes(semconv.HTTPResponseStatusCode(status)),
)
Expand Down
12 changes: 6 additions & 6 deletions third_party/contour-latest/net-contour.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
networking.knative.dev/ingress-provider: contour
app.kubernetes.io/component: net-contour
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250708-001479e0"
app.kubernetes.io/version: "1.19.7"
serving.knative.dev/controller: "true"
rules:
- apiGroups: ["projectcontour.io"]
Expand Down Expand Up @@ -38,7 +38,7 @@ metadata:
networking.knative.dev/ingress-provider: contour
app.kubernetes.io/component: net-contour
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250708-001479e0"
app.kubernetes.io/version: "1.19.7"
data:
_example: |
################################
Expand Down Expand Up @@ -111,7 +111,7 @@ metadata:
networking.knative.dev/ingress-provider: contour
app.kubernetes.io/component: net-contour
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250708-001479e0"
app.kubernetes.io/version: "1.19.7"
spec:
replicas: 1
selector:
Expand All @@ -123,14 +123,14 @@ spec:
app: net-contour-controller
app.kubernetes.io/component: net-contour
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250708-001479e0"
app.kubernetes.io/version: "1.19.7"
spec:
serviceAccountName: controller
containers:
- name: controller
# This is the Go import path for the binary that is containerized
# and substituted here.
image: gcr.io/knative-nightly/knative.dev/net-contour/cmd/controller@sha256:f608bd4a6987bf23124b2d9a41c9450b9c1fd52aab9b689390b519837aea8cf3
image: gcr.io/knative-releases/knative.dev/net-contour/cmd/controller@sha256:844dd2dbf3d14ad6c8356a80a50c70254512a4cf3cf6ec16c8f516cb0232be00
resources:
requests:
cpu: 40m
Expand Down Expand Up @@ -174,7 +174,7 @@ metadata:
networking.knative.dev/ingress-provider: contour
app.kubernetes.io/component: net-contour
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250708-001479e0"
app.kubernetes.io/version: "1.19.7"
spec:
delegations:
- secretName: routing-serving-certs
Expand Down
22 changes: 11 additions & 11 deletions third_party/gateway-api-latest/net-gateway-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
networking.knative.dev/ingress-provider: net-gateway-api
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
aggregationRule:
clusterRoleSelectors:
- matchLabels:
Expand All @@ -36,7 +36,7 @@ metadata:
networking.knative.dev/ingress-provider: net-gateway-api
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
rules:
- apiGroups: ["gateway.networking.k8s.io"]
resources: ["httproutes", "referencegrants", "referencepolicies"]
Expand Down Expand Up @@ -68,7 +68,7 @@ metadata:
labels:
networking.knative.dev/ingress-provider: net-gateway-api
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
app.kubernetes.io/name: knative-serving
spec:
replicas: 1
Expand All @@ -95,7 +95,7 @@ spec:
- name: controller
# This is the Go import path for the binary that is containerized
# and substituted here.
image: gcr.io/knative-nightly/knative.dev/net-gateway-api/cmd/controller@sha256:021808930f3d65a103eab2ceee80058724ffe0b73f463e614730177ddbd8a381
image: gcr.io/knative-releases/knative.dev/net-gateway-api/cmd/controller@sha256:9bf57bde4705afb9c9be11bb6b980a8247b4627b58cec26b3dbace8f98a702f6
resources:
requests:
cpu: 100m
Expand Down Expand Up @@ -152,7 +152,7 @@ metadata:
labels:
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
networking.knative.dev/ingress-provider: gateway-api
spec:
selector:
Expand All @@ -166,14 +166,14 @@ spec:
role: net-gateway-api-webhook
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
spec:
serviceAccountName: controller
containers:
- name: webhook
# This is the Go import path for the binary that is containerized
# and substituted here.
image: gcr.io/knative-nightly/knative.dev/net-gateway-api/cmd/webhook@sha256:350988929bce006855e83452e61a3914b5da7fe03e5e8f0e2f8f0c0cbd6f0c43
image: gcr.io/knative-releases/knative.dev/net-gateway-api/cmd/webhook@sha256:97fb56c2b216110579e055c514fe9804bca100973d5b8263f1b781ddbc127f94
resources:
requests:
cpu: 20m
Expand Down Expand Up @@ -251,7 +251,7 @@ metadata:
labels:
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
networking.knative.dev/ingress-provider: gateway-api

---
Expand All @@ -278,7 +278,7 @@ metadata:
role: net-gateway-api-webhook
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
networking.knative.dev/ingress-provider: gateway-api
spec:
ports:
Expand Down Expand Up @@ -317,7 +317,7 @@ metadata:
labels:
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
networking.knative.dev/ingress-provider: gateway-api
webhooks:
- admissionReviewVersions:
Expand Down Expand Up @@ -359,7 +359,7 @@ metadata:
networking.knative.dev/ingress-provider: net-gateway-api
app.kubernetes.io/component: net-gateway-api
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250711-a6310778"
app.kubernetes.io/version: "1.19.7"
data:
_example: |
################################
Expand Down
36 changes: 18 additions & 18 deletions third_party/istio-latest/net-istio.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated when HEAD was f51153b91b0d915594d80b6a6391d560ab8c824f
# Generated when HEAD was 0a0436f0ca4ddb3fafef60e9530cb52c5709a640
#
# Copyright 2019 The Knative Authors
#
Expand All @@ -22,7 +22,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
serving.knative.dev/controller: "true"
networking.knative.dev/ingress-provider: istio
rules:
Expand Down Expand Up @@ -54,7 +54,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
spec:
selector:
Expand Down Expand Up @@ -93,7 +93,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
spec:
selector:
Expand All @@ -114,7 +114,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
experimental.istio.io/disable-gateway-port-translation: "true"
spec:
Expand Down Expand Up @@ -152,7 +152,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
data:
# TODO(nghia): Extract the .svc.cluster.local suffix into its own config.
Expand Down Expand Up @@ -262,7 +262,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
spec:
selector:
Expand All @@ -280,7 +280,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
spec:
selector:
Expand Down Expand Up @@ -313,7 +313,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
spec:
selector:
Expand All @@ -329,14 +329,14 @@ spec:
app: net-istio-controller
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
spec:
serviceAccountName: controller
containers:
- name: controller
# This is the Go import path for the binary that is containerized
# and substituted here.
image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/controller@sha256:05b85a25dd4f60494f404d945789c25c15c76e64a445f4cf0ca6b27803d905d7
image: gcr.io/knative-releases/knative.dev/net-istio/cmd/controller@sha256:ae990d5171b291ba4ea36ede3d97664c420a8581d659706a696d9fffdc257aac
resources:
requests:
cpu: 30m
Expand Down Expand Up @@ -415,7 +415,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
spec:
selector:
Expand All @@ -429,14 +429,14 @@ spec:
role: net-istio-webhook
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
spec:
serviceAccountName: controller
containers:
- name: webhook
# This is the Go import path for the binary that is containerized
# and substituted here.
image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/webhook@sha256:9bd26b3a8ca73d23a4dc16980ff538dae9881a9deaf55921e25e20a3479d1c23
image: gcr.io/knative-releases/knative.dev/net-istio/cmd/webhook@sha256:f82ac6fe0d8c3607f206d0a858c4653c07a6ef254cfcf0dd15106a6cead38a2b
resources:
requests:
cpu: 20m
Expand Down Expand Up @@ -514,7 +514,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio

---
Expand All @@ -541,7 +541,7 @@ metadata:
role: net-istio-webhook
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
spec:
ports:
Expand Down Expand Up @@ -580,7 +580,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
webhooks:
- admissionReviewVersions:
Expand Down Expand Up @@ -619,7 +619,7 @@ metadata:
labels:
app.kubernetes.io/component: net-istio
app.kubernetes.io/name: knative-serving
app.kubernetes.io/version: "20250721-f51153b9"
app.kubernetes.io/version: "1.19.6"
networking.knative.dev/ingress-provider: istio
webhooks:
- admissionReviewVersions:
Expand Down
Loading
Loading