From 666b4fcbfb76f685cf37d73ac6fbb005b91a7787 Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Fri, 13 Mar 2020 08:58:30 -0700 Subject: [PATCH] Auto-update dependencies (#230) Produced via: `./hack/update-deps.sh --upgrade && ./hack/update-codegen.sh` /assign n3wscott vagababov /cc n3wscott vagababov --- Gopkg.lock | 8 +-- vendor/knative.dev/pkg/Gopkg.lock | 4 +- .../informers/core/v1/secret/fake/fake.go | 38 +++++++++++++ .../informers/core/v1/secret/secret.go | 50 +++++++++++++++++ .../informers/factory/factory.go | 53 +++++++++++++++++++ .../informers/factory/fake/fake.go | 42 +++++++++++++++ .../pkg/webhook/certificates/controller.go | 2 +- .../pkg/webhook/configmaps/controller.go | 2 +- .../pkg/webhook/psbinding/controller.go | 2 +- .../conversion/controller.go | 2 +- .../defaulting/controller.go | 2 +- .../validation/controller.go | 2 +- vendor/knative.dev/pkg/webhook/webhook.go | 2 +- .../knative.dev/test-infra/scripts/release.sh | 8 ++- 14 files changed, 203 insertions(+), 14 deletions(-) create mode 100644 vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/fake/fake.go create mode 100644 vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/secret.go create mode 100644 vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/factory.go create mode 100644 vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/fake/fake.go diff --git a/Gopkg.lock b/Gopkg.lock index 341947f8..1d1fdf4b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -966,7 +966,7 @@ [[projects]] branch = "master" - digest = "1:6794f3dda78fe3254a3561ef0d747b30f5e81f0acd7a79d5ae8dcbeb218704d6" + digest = "1:087752cbad644085941d5dbe2a04ef0c285fed9205006a5a3d3816256ac0fecd" name = "knative.dev/pkg" packages = [ "apis", @@ -986,18 +986,18 @@ "reconciler", ] pruneopts = "T" - revision = "a572b9922a9e2bdf860a9c9f3482782a912d9b25" + revision = "1893541a0fac5885032c8ec170fd81234de13f4a" [[projects]] branch = "master" - digest = "1:3d0c703375017dde28d1ee030d7f82ea838ab023841890ead18e91c8c9aded80" + digest = "1:e5bd21467544cbd14cb25553c5c78eb2e0e93baf9288a3c2ebaf1cf1fdb0c95f" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "7a8eea898f66fc7cd5fec6bb7c0fa2a80eeb702e" + revision = "3f96c9e98f31595fe33eaa2d95f5e2170522acd7" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index e4e14b97..4e52e3b5 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1342,14 +1342,14 @@ [[projects]] branch = "master" - digest = "1:dd8432987142e8a917e58bac0137c287f54399fa68b0760936d52dce04eb639b" + digest = "1:3d0c703375017dde28d1ee030d7f82ea838ab023841890ead18e91c8c9aded80" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "0c681e1f1df96322a62976d05d0add50bd50632e" + revision = "7a8eea898f66fc7cd5fec6bb7c0fa2a80eeb702e" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/fake/fake.go b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/fake/fake.go new file mode 100644 index 00000000..89384a18 --- /dev/null +++ b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/fake/fake.go @@ -0,0 +1,38 @@ +/* +Copyright 2020 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + context "context" + + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + secret "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret" + fake "knative.dev/pkg/injection/clients/namespacedkube/informers/factory/fake" +) + +var Get = secret.Get + +func init() { + injection.Fake.RegisterInformer(withInformer) +} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := fake.Get(ctx) + inf := f.Core().V1().Secrets() + return context.WithValue(ctx, secret.Key{}, inf), inf.Informer() +} diff --git a/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/secret.go b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/secret.go new file mode 100644 index 00000000..90d70627 --- /dev/null +++ b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret/secret.go @@ -0,0 +1,50 @@ +/* +Copyright 2020 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package secret + +import ( + context "context" + + v1 "k8s.io/client-go/informers/core/v1" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + factory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory" + logging "knative.dev/pkg/logging" +) + +func init() { + injection.Default.RegisterInformer(withInformer) +} + +// Key is used for associating the Informer inside the context.Context. +type Key struct{} + +func withInformer(ctx context.Context) (context.Context, controller.Informer) { + f := factory.Get(ctx) + inf := f.Core().V1().Secrets() + return context.WithValue(ctx, Key{}, inf), inf.Informer() +} + +// Get extracts the typed informer from the context. +func Get(ctx context.Context) v1.SecretInformer { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Panic( + "Unable to fetch k8s.io/client-go/informers/core/v1.SecretInformer from context.") + } + return untyped.(v1.SecretInformer) +} diff --git a/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/factory.go b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/factory.go new file mode 100644 index 00000000..ea8292aa --- /dev/null +++ b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/factory.go @@ -0,0 +1,53 @@ +/* +Copyright 2020 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package factory + +import ( + context "context" + + informers "k8s.io/client-go/informers" + client "knative.dev/pkg/client/injection/kube/client" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + logging "knative.dev/pkg/logging" + "knative.dev/pkg/system" +) + +func init() { + injection.Default.RegisterInformerFactory(withInformerFactory) +} + +// Key is used as the key for associating information with a context.Context. +type Key struct{} + +func withInformerFactory(ctx context.Context) context.Context { + c := client.Get(ctx) + return context.WithValue(ctx, Key{}, + informers.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), + // This factory scopes things to the system namespace. + informers.WithNamespace(system.Namespace()))) +} + +// Get extracts the InformerFactory from the context. +func Get(ctx context.Context) informers.SharedInformerFactory { + untyped := ctx.Value(Key{}) + if untyped == nil { + logging.FromContext(ctx).Panic( + "Unable to fetch k8s.io/client-go/informers.SharedInformerFactory from context.") + } + return untyped.(informers.SharedInformerFactory) +} diff --git a/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/fake/fake.go b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/fake/fake.go new file mode 100644 index 00000000..d92469c8 --- /dev/null +++ b/vendor/knative.dev/pkg/injection/clients/namespacedkube/informers/factory/fake/fake.go @@ -0,0 +1,42 @@ +/* +Copyright 2020 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package fake + +import ( + context "context" + + informers "k8s.io/client-go/informers" + fake "knative.dev/pkg/client/injection/kube/client/fake" + controller "knative.dev/pkg/controller" + injection "knative.dev/pkg/injection" + factory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory" + "knative.dev/pkg/system" +) + +var Get = factory.Get + +func init() { + injection.Fake.RegisterInformerFactory(withInformerFactory) +} + +func withInformerFactory(ctx context.Context) context.Context { + c := fake.Get(ctx) + return context.WithValue(ctx, factory.Key{}, + informers.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), + // This factory scopes things to the system namespace. + informers.WithNamespace(system.Namespace()))) +} diff --git a/vendor/knative.dev/pkg/webhook/certificates/controller.go b/vendor/knative.dev/pkg/webhook/certificates/controller.go index 43a7b60a..b8f40811 100644 --- a/vendor/knative.dev/pkg/webhook/certificates/controller.go +++ b/vendor/knative.dev/pkg/webhook/certificates/controller.go @@ -21,7 +21,7 @@ import ( // Injection stuff kubeclient "knative.dev/pkg/client/injection/kube/client" - secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" + secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret" "k8s.io/client-go/tools/cache" "knative.dev/pkg/configmap" diff --git a/vendor/knative.dev/pkg/webhook/configmaps/controller.go b/vendor/knative.dev/pkg/webhook/configmaps/controller.go index 725d7029..1e62f58e 100644 --- a/vendor/knative.dev/pkg/webhook/configmaps/controller.go +++ b/vendor/knative.dev/pkg/webhook/configmaps/controller.go @@ -23,7 +23,7 @@ import ( // Injection stuff kubeclient "knative.dev/pkg/client/injection/kube/client" vwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration" - secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" + secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret" "k8s.io/client-go/tools/cache" "knative.dev/pkg/configmap" diff --git a/vendor/knative.dev/pkg/webhook/psbinding/controller.go b/vendor/knative.dev/pkg/webhook/psbinding/controller.go index 8d17cb6b..76238d28 100644 --- a/vendor/knative.dev/pkg/webhook/psbinding/controller.go +++ b/vendor/knative.dev/pkg/webhook/psbinding/controller.go @@ -22,7 +22,7 @@ import ( // Injection stuff kubeclient "knative.dev/pkg/client/injection/kube/client" mwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration" - secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" + secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/cache" diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/controller.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/controller.go index b21003e0..1d107aac 100644 --- a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/controller.go +++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/controller.go @@ -26,8 +26,8 @@ import ( "knative.dev/pkg/apis" apixclient "knative.dev/pkg/client/injection/apiextensions/client" crdinformer "knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition" - secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" "knative.dev/pkg/controller" + secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret" "knative.dev/pkg/logging" "knative.dev/pkg/system" "knative.dev/pkg/webhook" diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go index 9f7135f6..ee23c7e2 100644 --- a/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go +++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/defaulting/controller.go @@ -22,7 +22,7 @@ import ( // Injection stuff kubeclient "knative.dev/pkg/client/injection/kube/client" mwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration" - secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" + secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go index 583784a4..c8e63f40 100644 --- a/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go +++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/validation/controller.go @@ -22,7 +22,7 @@ import ( // Injection stuff kubeclient "knative.dev/pkg/client/injection/kube/client" vwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration" - secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" + secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" diff --git a/vendor/knative.dev/pkg/webhook/webhook.go b/vendor/knative.dev/pkg/webhook/webhook.go index 43e03a8c..ec272a9c 100644 --- a/vendor/knative.dev/pkg/webhook/webhook.go +++ b/vendor/knative.dev/pkg/webhook/webhook.go @@ -25,7 +25,7 @@ import ( // Injection stuff kubeclient "knative.dev/pkg/client/injection/kube/client" - kubeinformerfactory "knative.dev/pkg/client/injection/kube/informers/factory" + kubeinformerfactory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/vendor/knative.dev/test-infra/scripts/release.sh b/vendor/knative.dev/test-infra/scripts/release.sh index 9c555777..d23c4c33 100755 --- a/vendor/knative.dev/test-infra/scripts/release.sh +++ b/vendor/knative.dev/test-infra/scripts/release.sh @@ -506,7 +506,13 @@ function main() { if [[ -n "${RELEASE_BRANCH}" && -z "${FROM_NIGHTLY_RELEASE}" && "${current_branch}" != "${RELEASE_BRANCH}" ]]; then setup_upstream setup_branch - git checkout upstream/"${RELEASE_BRANCH}" || abort "cannot checkout branch ${RELEASE_BRANCH}" + # When it runs in Prow, the origin is identical with upstream, and previous + # fetch already fetched release-* branches, so no need to `checkout -b` + if (( IS_PROW )); then + git checkout "${RELEASE_BRANCH}" || abort "cannot checkout branch ${RELEASE_BRANCH}" + else + git checkout -b "${RELEASE_BRANCH}" upstream/"${RELEASE_BRANCH}" || abort "cannot checkout branch ${RELEASE_BRANCH}" + fi # HACK HACK HACK # Rerun the release script from the release branch. Fixes https://github.com/knative/test-infra/issues/1262 ./hack/release.sh "$@"