Skip to content

Commit 0aab2b2

Browse files
upgrade to latest dependencies (#385)
Signed-off-by: Knative Automation <automation@knative.team>
1 parent 5bce8bf commit 0aab2b2

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
k8s.io/apimachinery v0.18.8
1616
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
1717
knative.dev/networking v0.0.0-20200922180040-a71b40c69b15
18-
knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab
18+
knative.dev/pkg v0.0.0-20201026165741-2f75016c1368
1919
knative.dev/test-infra v0.0.0-20200921012245-37f1a12adbd3
2020
)
2121

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,6 +1862,8 @@ knative.dev/pkg v0.0.0-20200528142800-1c6815d7e4c9/go.mod h1:QgNZTxnwpB/oSpNcfnL
18621862
knative.dev/pkg v0.0.0-20200711004937-22502028e31a/go.mod h1:AqAJV6rYi8IGikDjJ/9ZQd9qKdkXVlesVnVjwx62YB8=
18631863
knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab h1:4Q+sGqdN4ecLPZnIJcLDdQArEE9oOtRYiU2J6NPCCjU=
18641864
knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab/go.mod h1:MCyt5KqLaai6ENUitOgRAQsu7Gw7cAIIiXQ2IS+O0NI=
1865+
knative.dev/pkg v0.0.0-20201026165741-2f75016c1368 h1:KzDx2IerB4km4TG4PunacQvuSeWv4TJXTzjZ3ryKZ9o=
1866+
knative.dev/pkg v0.0.0-20201026165741-2f75016c1368/go.mod h1:MCyt5KqLaai6ENUitOgRAQsu7Gw7cAIIiXQ2IS+O0NI=
18651867
knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
18661868
knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
18671869
knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE=

vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,15 +603,15 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx {{.contextContext|raw}}, r
603603
patcher := r.Client.{{.group}}{{.version}}().{{.type|apiGroup}}(resource.Namespace)
604604
{{end}}
605605
resourceName := resource.Name
606-
resource, err = patcher.Patch(ctx, resourceName, {{.typesMergePatchType|raw}}, patch, {{.metav1PatchOptions|raw}}{})
606+
updated, err := patcher.Patch(ctx, resourceName, {{.typesMergePatchType|raw}}, patch, {{.metav1PatchOptions|raw}}{})
607607
if err != nil {
608-
r.Recorder.Eventf(resource, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
608+
r.Recorder.Eventf(existing, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
609609
"Failed to update finalizers for %q: %v", resourceName, err)
610610
} else {
611-
r.Recorder.Eventf(resource, {{.corev1EventTypeNormal|raw}}, "FinalizerUpdate",
611+
r.Recorder.Eventf(updated, {{.corev1EventTypeNormal|raw}}, "FinalizerUpdate",
612612
"Updated %q finalizers", resource.GetName())
613613
}
614-
return resource, err
614+
return updated, err
615615
}
616616
617617
func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx {{.contextContext|raw}}, resource *{{.type|raw}}) (*{{.type|raw}}, error) {

vendor/knative.dev/pkg/injection/sharedmain/main.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,16 @@ func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, cto
225225
cfg.Burst = len(ctors) * rest.DefaultBurst
226226
}
227227

228-
ctx = EnableInjectionOrDie(ctx, cfg)
228+
// Respect user provided settings, but if omitted customize the default behavior.
229+
if cfg.QPS == 0 {
230+
cfg.QPS = rest.DefaultQPS
231+
}
232+
if cfg.Burst == 0 {
233+
cfg.Burst = rest.DefaultBurst
234+
}
235+
ctx = injection.WithConfig(ctx, cfg)
236+
237+
ctx, informers := injection.Default.SetupInformers(ctx, cfg)
229238

230239
logger, atomicLevel := SetupLoggerOrDie(ctx, component)
231240
defer flush(logger)
@@ -278,7 +287,11 @@ func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, cto
278287
return wh.Run(ctx.Done())
279288
})
280289
}
281-
290+
// Start the injection clients and informers.
291+
logging.FromContext(ctx).Info("Starting informers...")
292+
if err := controller.StartInformers(ctx.Done(), informers...); err != nil {
293+
logging.FromContext(ctx).Fatalw("Failed to start informers", zap.Error(err))
294+
}
282295
// Wait for webhook informers to sync.
283296
if wh != nil {
284297
wh.InformersHaveSynced()

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ knative.dev/networking/test/test_images/runtime/handlers
898898
knative.dev/networking/test/test_images/timeout
899899
knative.dev/networking/test/test_images/wsserver
900900
knative.dev/networking/test/types
901-
# knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab
901+
# knative.dev/pkg v0.0.0-20201026165741-2f75016c1368
902902
## explicit
903903
knative.dev/pkg/apis
904904
knative.dev/pkg/apis/duck

0 commit comments

Comments
 (0)