Skip to content

Commit ff161e4

Browse files
committed
chore: update codegen
1 parent bce6146 commit ff161e4

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

vendor/knative.dev/pkg/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ func (c *Impl) RunContext(ctx context.Context, threadiness int) error {
470470
}
471471

472472
// Launch workers to process resources that get enqueued to our workqueue.
473-
c.logger.Infow("Starting controller and workers", zap.Int("threadiness", threadiness))
473+
c.logger.Info("Starting controller and workers")
474474
for range threadiness {
475475
sg.Add(1)
476476
go func() {

vendor/knative.dev/pkg/controller/queue_metrics.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,13 @@ func (m *queueMetrics) get(item any) {
8888
m.mu.Lock()
8989
defer m.mu.Unlock()
9090

91+
m.depth.Dec()
92+
m.processingStartTimes[item] = m.clock.Now()
93+
9194
if startTime, exists := m.addTimes[item]; exists {
92-
m.depth.Dec()
9395
m.latency.Observe(m.sinceInSeconds(startTime))
9496
delete(m.addTimes, item)
9597
}
96-
97-
if _, exists := m.processingStartTimes[item]; !exists {
98-
m.processingStartTimes[item] = m.clock.Now()
99-
}
10098
}
10199

102100
func (m *queueMetrics) done(item any) {

vendor/knative.dev/pkg/controller/two_lane_queue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ func (q *twoLaneRateLimitingQueue) slowLane() workqueue.TypedInterface[any] {
223223
// It gets the item from fast lane if it has anything, alternatively
224224
// the slow lane.
225225
func (tlq *twoLaneQueue) Get() (any, bool) {
226-
item, shutdown := tlq.consumerQueue.Get()
226+
item, ok := tlq.consumerQueue.Get()
227227
tlq.metrics.get(item)
228-
return item, shutdown
228+
return item, ok
229229
}
230230

231231
// Len returns the sum of lengths.

vendor/knative.dev/pkg/hack/update-codegen.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ go run k8s.io/code-generator/cmd/deepcopy-gen \
7373
knative.dev/pkg/apis/duck/v1 \
7474
knative.dev/pkg/tracker \
7575
knative.dev/pkg/logging \
76+
knative.dev/pkg/metrics \
7677
knative.dev/pkg/testing \
7778
knative.dev/pkg/testing/duck \
7879
knative.dev/pkg/webhook/resourcesemantics/conversion/internal

vendor/knative.dev/pkg/hack/verify-codegen.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ cp -aR \
3737
"${REPO_ROOT_DIR}/go.sum" \
3838
"${REPO_ROOT_DIR}/apis" \
3939
"${REPO_ROOT_DIR}/logging" \
40+
"${REPO_ROOT_DIR}/metrics" \
4041
"${REPO_ROOT_DIR}/testing" \
4142
"${REPO_ROOT_DIR}/vendor" \
4243
"${TMP_DIFFROOT}"
@@ -54,6 +55,9 @@ diff -Naupr --no-dereference \
5455
diff -Naupr --no-dereference \
5556
"${REPO_ROOT_DIR}/logging" "${TMP_DIFFROOT}/logging" || ret=1
5657

58+
diff -Naupr --no-dereference \
59+
"${REPO_ROOT_DIR}/metrics" "${TMP_DIFFROOT}/metrics" || ret=1
60+
5761
diff -Naupr --no-dereference \
5862
"${REPO_ROOT_DIR}/testing" "${TMP_DIFFROOT}/testing" || ret=1
5963

@@ -65,6 +69,7 @@ rm -fr \
6569
"${REPO_ROOT_DIR}/go.sum" \
6670
"${REPO_ROOT_DIR}/apis" \
6771
"${REPO_ROOT_DIR}/logging" \
72+
"${REPO_ROOT_DIR}/metrics" \
6873
"${REPO_ROOT_DIR}/testing" \
6974
"${REPO_ROOT_DIR}/vendor"
7075

vendor/knative.dev/pkg/network/transports.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ func dialBackOffHelper(ctx context.Context, network, address string, bo wait.Bac
9696
if tlsConf == nil {
9797
c, err = dialer.DialContext(ctx, network, address)
9898
} else {
99-
d := tls.Dialer{NetDialer: dialer, Config: tlsConf}
100-
c, err = d.DialContext(ctx, network, address)
99+
c, err = tls.DialWithDialer(dialer, network, address, tlsConf)
101100
}
102101
if err != nil {
103102
var errNet net.Error

0 commit comments

Comments
 (0)