Skip to content

Commit 15bec19

Browse files
upgrade to latest dependencies (#698)
bumping knative.dev/networking e3b68fc...5e69dbb: > 5e69dbb upgrade to latest dependencies (# 1085) > 8cc248b upgrade to latest dependencies (# 1084) bumping knative.dev/serving 4ce8c6e...d23ede0: > d23ede0 Update net-kourier nightly (# 16124) > f0cc1b3 Update net-gateway-api nightly (# 16123) > a5a87df Update net-contour nightly (# 16122) > 131d3a2 Update net-istio nightly (# 16121) > 84893c2 Revert "Add default conditions to create PA to avoid potential race conditions (# 16078)" (# 16118) > ef634ca upgrade to latest dependencies (# 16120) bumping knative.dev/pkg 72b164e...a624c75: > a624c75 create a knative semconv package to simplify otel dep bumps (# 3269) Signed-off-by: Knative Automation <[email protected]>
1 parent 1c50829 commit 15bec19

File tree

9 files changed

+123
-22
lines changed

9 files changed

+123
-22
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
k8s.io/client-go v0.33.5
1616
knative.dev/eventing v0.46.1-0.20251007025010-8f709d0e332f
1717
knative.dev/hack v0.0.0-20250902153942-1499de21e119
18-
knative.dev/pkg v0.0.0-20251007132912-72b164e68f86
19-
knative.dev/serving v0.46.1-0.20251007000510-4ce8c6e900ec
18+
knative.dev/pkg v0.0.0-20251007184713-a624c759bede
19+
knative.dev/serving v0.46.1-0.20251007212712-d23ede0d36fb
2020
)
2121

2222
require (
@@ -114,7 +114,7 @@ require (
114114
k8s.io/klog/v2 v2.130.1 // indirect
115115
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
116116
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
117-
knative.dev/networking v0.0.0-20250909015233-e3b68fc57bea // indirect
117+
knative.dev/networking v0.0.0-20251007015313-5e69dbb20593 // indirect
118118
sigs.k8s.io/gateway-api v1.1.0 // indirect
119119
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
120120
sigs.k8s.io/randfill v1.0.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,12 @@ knative.dev/eventing v0.46.1-0.20251007025010-8f709d0e332f h1:AKNHqGwWU8iRGUs0bM
393393
knative.dev/eventing v0.46.1-0.20251007025010-8f709d0e332f/go.mod h1:1WlpUBqZSSfKQfCxW7enI1Yutn4WpQv0eFQ+KoAXPOw=
394394
knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M=
395395
knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
396-
knative.dev/networking v0.0.0-20250909015233-e3b68fc57bea h1:712x0cJVdyKELYhO9Asie79wD4AvW/6bmdqGAAB6QYQ=
397-
knative.dev/networking v0.0.0-20250909015233-e3b68fc57bea/go.mod h1:P8mxand4fkoIIucr7pVv4sVk3IpTGGCQpJbwKu8fhy4=
398-
knative.dev/pkg v0.0.0-20251007132912-72b164e68f86 h1:ez6Q3QIqKs9r4fKkEGlwsOAqxvhP9OlEAyy5ObMpePM=
399-
knative.dev/pkg v0.0.0-20251007132912-72b164e68f86/go.mod h1:pNETfvzYq5MmPTi+XGGIjjgvQSYvu4pxxLF1muKunhs=
400-
knative.dev/serving v0.46.1-0.20251007000510-4ce8c6e900ec h1:Z6oGWwlgo08tCZxEHtdBYO+PmkqDaoIJiTw1KbA7Yzc=
401-
knative.dev/serving v0.46.1-0.20251007000510-4ce8c6e900ec/go.mod h1:lQk+jslR4hAA6dtUBQpRWrOX0EfkdUduR3/hZmMWNdA=
396+
knative.dev/networking v0.0.0-20251007015313-5e69dbb20593 h1:Jjsz+IMCXsDB9qOyBNp6SWHTmz3+SJou65Cf0Rs96B0=
397+
knative.dev/networking v0.0.0-20251007015313-5e69dbb20593/go.mod h1:HMfGoXTbo27P2OckQipJvaJSUWMe4Vdt4tzDCfHkHuQ=
398+
knative.dev/pkg v0.0.0-20251007184713-a624c759bede h1:ADQEXMQlfbjBjicJdou8R5WjPHm0/5FyyV58RQ9eYPU=
399+
knative.dev/pkg v0.0.0-20251007184713-a624c759bede/go.mod h1:pNETfvzYq5MmPTi+XGGIjjgvQSYvu4pxxLF1muKunhs=
400+
knative.dev/serving v0.46.1-0.20251007212712-d23ede0d36fb h1:gJ1c85YFcT0L6zMCRrbrZfLFqXq73IlUs6Q2mIgThoY=
401+
knative.dev/serving v0.46.1-0.20251007212712-d23ede0d36fb/go.mod h1:He+gUCV8wQCm2JY1+hVPoATFVbrdub7mNTTFmUJG920=
402402
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
403403
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
404404
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

vendor/knative.dev/pkg/observability/metrics/k8s/tools.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ import (
2323
"strings"
2424
"time"
2525

26+
"knative.dev/pkg/observability/semconv"
27+
"knative.dev/pkg/observability/semconv/httpconv"
28+
2629
"go.opentelemetry.io/otel"
2730
"go.opentelemetry.io/otel/attribute"
2831
"go.opentelemetry.io/otel/metric"
29-
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
30-
"go.opentelemetry.io/otel/semconv/v1.37.0/httpconv"
3132
"k8s.io/client-go/tools/metrics"
3233
)
3334

vendor/knative.dev/pkg/observability/resource/default.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"os"
2121

2222
"knative.dev/pkg/changeset"
23+
"knative.dev/pkg/observability/semconv"
2324
"knative.dev/pkg/system"
2425

2526
"go.opentelemetry.io/otel/attribute"
2627
"go.opentelemetry.io/otel/sdk/resource"
27-
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
2828
)
2929

3030
const otelServiceNameKey = "OTEL_SERVICE_NAME"
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*
2+
Copyright 2022 The Knative Authors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package httpconv
18+
19+
import (
20+
"go.opentelemetry.io/otel/metric"
21+
"go.opentelemetry.io/otel/semconv/v1.37.0/httpconv"
22+
)
23+
24+
type (
25+
ClientRequestDuration = httpconv.ClientRequestDuration
26+
RequestMethodAttr = httpconv.RequestMethodAttr
27+
)
28+
29+
func NewClientRequestDuration(
30+
m metric.Meter,
31+
opt ...metric.Float64HistogramOption,
32+
) (httpconv.ClientRequestDuration, error) {
33+
return httpconv.NewClientRequestDuration(m, opt...)
34+
}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
Copyright 2022 The Knative Authors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package semconv
18+
19+
import (
20+
"go.opentelemetry.io/otel/attribute"
21+
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
22+
)
23+
24+
const (
25+
SchemaURL = semconv.SchemaURL
26+
27+
ServiceNameKey = semconv.ServiceNameKey
28+
29+
ServerAddressKey = semconv.ServerAddressKey
30+
ServerPortKey = semconv.ServerPortKey
31+
32+
HTTPRequestMethodKey = semconv.HTTPRequestMethodKey
33+
HTTPResponseStatusCodeKey = semconv.HTTPResponseStatusCodeKey
34+
35+
URLSchemeKey = semconv.URLSchemeKey
36+
URLTemplateKey = semconv.URLTemplateKey
37+
38+
K8SNamespaceNameKey = semconv.K8SNamespaceNameKey
39+
K8SPodNameKey = semconv.K8SPodNameKey
40+
K8SContainerNameKey = semconv.K8SContainerNameKey
41+
)
42+
43+
func K8SContainerName(val string) attribute.KeyValue {
44+
return semconv.ContainerName(val)
45+
}
46+
47+
func K8SPodName(val string) attribute.KeyValue {
48+
return semconv.K8SPodName(val)
49+
}
50+
51+
func K8SNamespaceName(val string) attribute.KeyValue {
52+
return semconv.K8SNamespaceName(val)
53+
}
54+
55+
func ServiceVersion(val string) attribute.KeyValue {
56+
return semconv.ServiceVersion(val)
57+
}
58+
59+
func ServiceName(val string) attribute.KeyValue {
60+
return semconv.ServiceName(val)
61+
}
62+
63+
func ServiceInstanceID(val string) attribute.KeyValue {
64+
return semconv.ServiceInstanceID(val)
65+
}
66+
67+
func HTTPResponseStatusCode(val int) attribute.KeyValue {
68+
return semconv.HTTPResponseStatusCode(val)
69+
}

vendor/knative.dev/serving/pkg/apis/autoscaling/v1alpha1/pa_types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,14 @@ const (
112112

113113
// PodAutoscalerStatus communicates the observed state of the PodAutoscaler (from the controller).
114114
type PodAutoscalerStatus struct {
115-
// +kubebuilder:default={"conditions": {{"type":"Active", "status": "Unknown", "reason": "Pending", "message": "Waiting for controller", "severity": "", "lastTransitionTime": "1970-01-01T00:00:00Z"}, {"type":"Ready", "status": "Unknown", "reason": "Pending", "message": "Waiting for controller", "severity": "", "lastTransitionTime": "1970-01-01T00:00:00Z"}, {"type":"SKSReady", "status": "Unknown", "reason": "Pending", "message": "Waiting for controller", "severity": "", "lastTransitionTime": "1970-01-01T00:00:00Z"}, {"type":"ScaleTargetInitialized", "status": "Unknown", "reason": "Pending", "message": "Waiting for controller", "severity": "", "lastTransitionTime": "1970-01-01T00:00:00Z"}}}
116115
duckv1.Status `json:",inline"`
117116

118117
// ServiceName is the K8s Service name that serves the revision, scaled by this PA.
119118
// The service is created and owned by the ServerlessService object owned by this PA.
120-
// +optional
121119
ServiceName string `json:"serviceName"`
122120

123121
// MetricsServiceName is the K8s Service name that provides revision metrics.
124122
// The service is managed by the PA object.
125-
// +optional
126123
MetricsServiceName string `json:"metricsServiceName"`
127124

128125
// DesiredScale shows the current desired number of replicas for the revision.

vendor/knative.dev/serving/pkg/apis/serving/v1/revision_lifecycle.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ func (rs *RevisionStatus) PropagateAutoscalerStatus(ps *autoscalingv1alpha1.PodA
184184
rs.DesiredReplicas = ps.DesiredScale
185185
}
186186

187-
sksCondition := ps.GetCondition(autoscalingv1alpha1.PodAutoscalerConditionSKSReady)
188-
if cond == nil || (cond.IsUnknown() && sksCondition != nil && sksCondition.IsUnknown()) {
187+
if cond == nil {
189188
rs.MarkActiveUnknown(ReasonDeploying, "")
190189

191190
if !resUnavailable {
@@ -220,7 +219,6 @@ func (rs *RevisionStatus) PropagateAutoscalerStatus(ps *autoscalingv1alpha1.PodA
220219
// 2. Initial scale was never achieved, which means we failed to progress
221220
// towards initial scale during the progress deadline period and scaled to 0
222221
// failing to activate.
223-
// 3. Need to make sure to wait for SKS to be ready, or at least fail.
224222
// So mark the revision as failed at that point.
225223
// See #8922 for details. When we try to scale to 0, we force the Deployment's
226224
// Progress status to become `true`, since successful scale down means
@@ -230,7 +228,7 @@ func (rs *RevisionStatus) PropagateAutoscalerStatus(ps *autoscalingv1alpha1.PodA
230228
// ScaleTargetInitialized down the road, we would have marked resources
231229
// unavailable here, and have no way of recovering later.
232230
// If the ResourcesAvailable is already false, don't override the message.
233-
if !ps.IsScaleTargetInitialized() && !resUnavailable && ps.ServiceName != "" && !sksCondition.IsUnknown() {
231+
if !ps.IsScaleTargetInitialized() && !resUnavailable && ps.ServiceName != "" {
234232
rs.MarkResourcesAvailableFalse(ReasonProgressDeadlineExceeded,
235233
"Initial scale was never achieved")
236234
}

vendor/modules.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,12 +1170,12 @@ knative.dev/eventing/pkg/utils
11701170
# knative.dev/hack v0.0.0-20250902153942-1499de21e119
11711171
## explicit; go 1.21
11721172
knative.dev/hack
1173-
# knative.dev/networking v0.0.0-20250909015233-e3b68fc57bea
1173+
# knative.dev/networking v0.0.0-20251007015313-5e69dbb20593
11741174
## explicit; go 1.24.0
11751175
knative.dev/networking/pkg/apis/networking
11761176
knative.dev/networking/pkg/apis/networking/v1alpha1
11771177
knative.dev/networking/pkg/config
1178-
# knative.dev/pkg v0.0.0-20251007132912-72b164e68f86
1178+
# knative.dev/pkg v0.0.0-20251007184713-a624c759bede
11791179
## explicit; go 1.24.0
11801180
knative.dev/pkg/apis
11811181
knative.dev/pkg/apis/duck
@@ -1228,6 +1228,8 @@ knative.dev/pkg/observability/metrics/prometheus
12281228
knative.dev/pkg/observability/resource
12291229
knative.dev/pkg/observability/runtime
12301230
knative.dev/pkg/observability/runtime/k8s
1231+
knative.dev/pkg/observability/semconv
1232+
knative.dev/pkg/observability/semconv/httpconv
12311233
knative.dev/pkg/observability/tracing
12321234
knative.dev/pkg/ptr
12331235
knative.dev/pkg/reconciler
@@ -1240,7 +1242,7 @@ knative.dev/pkg/tracker
12401242
knative.dev/pkg/version
12411243
knative.dev/pkg/webhook
12421244
knative.dev/pkg/webhook/certificates/resources
1243-
# knative.dev/serving v0.46.1-0.20251007000510-4ce8c6e900ec
1245+
# knative.dev/serving v0.46.1-0.20251007212712-d23ede0d36fb
12441246
## explicit; go 1.24.0
12451247
knative.dev/serving/pkg/apis/autoscaling
12461248
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)