diff --git a/Gopkg.lock b/Gopkg.lock index f4a0f3de..401511c9 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -966,7 +966,7 @@ [[projects]] branch = "master" - digest = "1:f44b87ebe4aefb51530107b1d09dce6b81fc35c45117e4025f1dbcb33315a4a8" + digest = "1:cc94fa80f6e4903c1c5b2fc8673156762b2ab2dfe3be11486fea0307e9de71b8" name = "knative.dev/pkg" packages = [ "apis", @@ -986,7 +986,7 @@ "reconciler", ] pruneopts = "T" - revision = "d9a38f13e8b9aa736f714b793ee28788de1b30e0" + revision = "a2e3b66654c1bcd82df07f8b4c45b19bad7ab21a" [[projects]] branch = "master" @@ -997,7 +997,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "0a90cb89503890eab3452dac905b54c67c53145f" + revision = "39583d93138a50f40291bbeb74dbacbfc4e7d4c7" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/pkg/client/injection/client/client.go b/pkg/client/injection/client/client.go index 5bafae13..96d0def9 100644 --- a/pkg/client/injection/client/client.go +++ b/pkg/client/injection/client/client.go @@ -19,7 +19,7 @@ limitations under the License. package client import ( - "context" + context "context" rest "k8s.io/client-go/rest" versioned "knative.dev/caching/pkg/client/clientset/versioned" diff --git a/pkg/client/injection/client/fake/fake.go b/pkg/client/injection/client/fake/fake.go index 461c631b..cb058725 100644 --- a/pkg/client/injection/client/fake/fake.go +++ b/pkg/client/injection/client/fake/fake.go @@ -19,10 +19,10 @@ limitations under the License. package fake import ( - "context" + context "context" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/rest" + runtime "k8s.io/apimachinery/pkg/runtime" + rest "k8s.io/client-go/rest" fake "knative.dev/caching/pkg/client/clientset/versioned/fake" client "knative.dev/caching/pkg/client/injection/client" injection "knative.dev/pkg/injection" diff --git a/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go b/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go index ea8b0616..fb1c3fab 100644 --- a/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go +++ b/pkg/client/injection/informers/caching/v1alpha1/image/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" image "knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image" fake "knative.dev/caching/pkg/client/injection/informers/factory/fake" diff --git a/pkg/client/injection/informers/caching/v1alpha1/image/image.go b/pkg/client/injection/informers/caching/v1alpha1/image/image.go index 7a64fca1..a1bc38a4 100644 --- a/pkg/client/injection/informers/caching/v1alpha1/image/image.go +++ b/pkg/client/injection/informers/caching/v1alpha1/image/image.go @@ -19,7 +19,7 @@ limitations under the License. package image import ( - "context" + context "context" v1alpha1 "knative.dev/caching/pkg/client/informers/externalversions/caching/v1alpha1" factory "knative.dev/caching/pkg/client/injection/informers/factory" diff --git a/pkg/client/injection/informers/factory/factory.go b/pkg/client/injection/informers/factory/factory.go index 2517605a..13b70057 100644 --- a/pkg/client/injection/informers/factory/factory.go +++ b/pkg/client/injection/informers/factory/factory.go @@ -19,7 +19,7 @@ limitations under the License. package factory import ( - "context" + context "context" externalversions "knative.dev/caching/pkg/client/informers/externalversions" client "knative.dev/caching/pkg/client/injection/client" diff --git a/pkg/client/injection/informers/factory/fake/fake.go b/pkg/client/injection/informers/factory/fake/fake.go index 87ce9a57..3062fc7f 100644 --- a/pkg/client/injection/informers/factory/fake/fake.go +++ b/pkg/client/injection/informers/factory/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" externalversions "knative.dev/caching/pkg/client/informers/externalversions" fake "knative.dev/caching/pkg/client/injection/client/fake" diff --git a/vendor/knative.dev/pkg/client/injection/apiextensions/client/client.go b/vendor/knative.dev/pkg/client/injection/apiextensions/client/client.go index 5e9edf33..0881e870 100644 --- a/vendor/knative.dev/pkg/client/injection/apiextensions/client/client.go +++ b/vendor/knative.dev/pkg/client/injection/apiextensions/client/client.go @@ -19,7 +19,7 @@ limitations under the License. package client import ( - "context" + context "context" clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" rest "k8s.io/client-go/rest" diff --git a/vendor/knative.dev/pkg/client/injection/apiextensions/client/fake/fake.go b/vendor/knative.dev/pkg/client/injection/apiextensions/client/fake/fake.go index 8569828e..1ed12987 100644 --- a/vendor/knative.dev/pkg/client/injection/apiextensions/client/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/apiextensions/client/fake/fake.go @@ -19,11 +19,11 @@ limitations under the License. package fake import ( - "context" + context "context" fake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/rest" + runtime "k8s.io/apimachinery/pkg/runtime" + rest "k8s.io/client-go/rest" client "knative.dev/pkg/client/injection/apiextensions/client" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" diff --git a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/customresourcedefinition.go b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/customresourcedefinition.go index 1c38d0a5..b8835ae5 100644 --- a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/customresourcedefinition.go +++ b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/customresourcedefinition.go @@ -19,7 +19,7 @@ limitations under the License. package customresourcedefinition import ( - "context" + context "context" v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1" factory "knative.dev/pkg/client/injection/apiextensions/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/fake/fake.go b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/fake/fake.go index 5a3ae2c3..0da71e0e 100644 --- a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" customresourcedefinition "knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition" fake "knative.dev/pkg/client/injection/apiextensions/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/factory.go b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/factory.go index 733e7598..346d9b67 100644 --- a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/factory.go +++ b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/factory.go @@ -19,7 +19,7 @@ limitations under the License. package factory import ( - "context" + context "context" externalversions "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" client "knative.dev/pkg/client/injection/apiextensions/client" diff --git a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/fake/fake.go b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/fake/fake.go index 9a7406b2..5a96b591 100644 --- a/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/apiextensions/informers/factory/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" externalversions "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions" fake "knative.dev/pkg/client/injection/apiextensions/client/fake" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/addressable/addressable.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/addressable/addressable.go index ffe769e8..09a21e06 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/addressable/addressable.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/addressable/addressable.go @@ -19,7 +19,7 @@ limitations under the License. package addressable import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1 "knative.dev/pkg/apis/duck/v1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/conditions/conditions.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/conditions/conditions.go index b9cf6460..6016a501 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/conditions/conditions.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/conditions/conditions.go @@ -19,7 +19,7 @@ limitations under the License. package conditions import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1 "knative.dev/pkg/apis/duck/v1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/podspecable/podspecable.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/podspecable/podspecable.go index 0ca6b94b..9ae0971d 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/podspecable/podspecable.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/podspecable/podspecable.go @@ -19,7 +19,7 @@ limitations under the License. package podspecable import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1 "knative.dev/pkg/apis/duck/v1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/source/source.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/source/source.go index e4e06ff0..5d1f0f01 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/source/source.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1/source/source.go @@ -19,7 +19,7 @@ limitations under the License. package source import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1 "knative.dev/pkg/apis/duck/v1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/addressable/addressable.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/addressable/addressable.go index 7cbd6176..15c3e032 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/addressable/addressable.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/addressable/addressable.go @@ -19,7 +19,7 @@ limitations under the License. package addressable import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1alpha1 "knative.dev/pkg/apis/duck/v1alpha1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/binding/binding.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/binding/binding.go index 88bbedfa..91a5620d 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/binding/binding.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/binding/binding.go @@ -19,7 +19,7 @@ limitations under the License. package binding import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1alpha1 "knative.dev/pkg/apis/duck/v1alpha1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/legacytargetable/legacytargetable.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/legacytargetable/legacytargetable.go index f6d53503..cad34ad0 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/legacytargetable/legacytargetable.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/legacytargetable/legacytargetable.go @@ -19,7 +19,7 @@ limitations under the License. package legacytargetable import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1alpha1 "knative.dev/pkg/apis/duck/v1alpha1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/targetable/targetable.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/targetable/targetable.go index 1b140177..90937d4c 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/targetable/targetable.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1alpha1/targetable/targetable.go @@ -19,7 +19,7 @@ limitations under the License. package targetable import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1alpha1 "knative.dev/pkg/apis/duck/v1alpha1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/addressable/addressable.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/addressable/addressable.go index a27000df..691f634f 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/addressable/addressable.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/addressable/addressable.go @@ -19,7 +19,7 @@ limitations under the License. package addressable import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1beta1 "knative.dev/pkg/apis/duck/v1beta1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/conditions/conditions.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/conditions/conditions.go index a5cd5108..d605e758 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/conditions/conditions.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/conditions/conditions.go @@ -19,7 +19,7 @@ limitations under the License. package conditions import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1beta1 "knative.dev/pkg/apis/duck/v1beta1" diff --git a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/source/source.go b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/source/source.go index d3ec41ee..b071729f 100644 --- a/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/source/source.go +++ b/vendor/knative.dev/pkg/client/injection/ducks/duck/v1beta1/source/source.go @@ -19,7 +19,7 @@ limitations under the License. package source import ( - "context" + context "context" duck "knative.dev/pkg/apis/duck" v1beta1 "knative.dev/pkg/apis/duck/v1beta1" diff --git a/vendor/knative.dev/pkg/client/injection/kube/client/client.go b/vendor/knative.dev/pkg/client/injection/kube/client/client.go index f0b67a35..fb62015c 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/client/client.go +++ b/vendor/knative.dev/pkg/client/injection/kube/client/client.go @@ -19,7 +19,7 @@ limitations under the License. package client import ( - "context" + context "context" kubernetes "k8s.io/client-go/kubernetes" rest "k8s.io/client-go/rest" diff --git a/vendor/knative.dev/pkg/client/injection/kube/client/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/client/fake/fake.go index d69f4a95..022ae42f 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/client/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/client/fake/fake.go @@ -19,11 +19,11 @@ limitations under the License. package fake import ( - "context" + context "context" - "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" fake "k8s.io/client-go/kubernetes/fake" - "k8s.io/client-go/rest" + rest "k8s.io/client-go/rest" client "knative.dev/pkg/client/injection/kube/client" injection "knative.dev/pkg/injection" logging "knative.dev/pkg/logging" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/fake/fake.go index 3cc76fc2..5bccc362 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" mutatingwebhookconfiguration "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/mutatingwebhookconfiguration.go b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/mutatingwebhookconfiguration.go index 29b5882e..452bd44e 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/mutatingwebhookconfiguration.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration/mutatingwebhookconfiguration.go @@ -19,7 +19,7 @@ limitations under the License. package mutatingwebhookconfiguration import ( - "context" + context "context" v1beta1 "k8s.io/client-go/informers/admissionregistration/v1beta1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/fake/fake.go index 2d6b7d5c..32f83016 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" validatingwebhookconfiguration "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/validatingwebhookconfiguration.go b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/validatingwebhookconfiguration.go index 72d61573..5ebe7b71 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/validatingwebhookconfiguration.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration/validatingwebhookconfiguration.go @@ -19,7 +19,7 @@ limitations under the License. package validatingwebhookconfiguration import ( - "context" + context "context" v1beta1 "k8s.io/client-go/informers/admissionregistration/v1beta1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/controllerrevision.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/controllerrevision.go index 5f7a5a53..4399e60b 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/controllerrevision.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/controllerrevision.go @@ -19,7 +19,7 @@ limitations under the License. package controllerrevision import ( - "context" + context "context" v1 "k8s.io/client-go/informers/apps/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/fake/fake.go index 75c14607..c7a41181 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" controllerrevision "knative.dev/pkg/client/injection/kube/informers/apps/v1/controllerrevision" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/daemonset.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/daemonset.go index ae4f54c5..3056e47d 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/daemonset.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/daemonset.go @@ -19,7 +19,7 @@ limitations under the License. package daemonset import ( - "context" + context "context" v1 "k8s.io/client-go/informers/apps/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/fake/fake.go index ec8c50be..1e194132 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" daemonset "knative.dev/pkg/client/injection/kube/informers/apps/v1/daemonset" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/deployment.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/deployment.go index bf555504..066e592a 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/deployment.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/deployment.go @@ -19,7 +19,7 @@ limitations under the License. package deployment import ( - "context" + context "context" v1 "k8s.io/client-go/informers/apps/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake/fake.go index f126f2a9..88de4980 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" deployment "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/fake/fake.go index df3b07be..3c5a105d 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" replicaset "knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/replicaset.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/replicaset.go index 9386c324..bae7ea60 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/replicaset.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/replicaset/replicaset.go @@ -19,7 +19,7 @@ limitations under the License. package replicaset import ( - "context" + context "context" v1 "k8s.io/client-go/informers/apps/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/fake/fake.go index 9f2d178b..104f1e2c 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" statefulset "knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/statefulset.go b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/statefulset.go index a4c31d86..1f25874d 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/statefulset.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset/statefulset.go @@ -19,7 +19,7 @@ limitations under the License. package statefulset import ( - "context" + context "context" v1 "k8s.io/client-go/informers/apps/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/fake/fake.go index 87e407a8..70c811f6 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" horizontalpodautoscaler "knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/horizontalpodautoscaler.go b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/horizontalpodautoscaler.go index 3f9ef82f..ea9b9bec 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/horizontalpodautoscaler.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v1/horizontalpodautoscaler/horizontalpodautoscaler.go @@ -19,7 +19,7 @@ limitations under the License. package horizontalpodautoscaler import ( - "context" + context "context" v1 "k8s.io/client-go/informers/autoscaling/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/fake/fake.go index 120dd269..1cec2347 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" horizontalpodautoscaler "knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/horizontalpodautoscaler.go b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/horizontalpodautoscaler.go index e3bc8d3b..bfe252d3 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/horizontalpodautoscaler.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/autoscaling/v2beta1/horizontalpodautoscaler/horizontalpodautoscaler.go @@ -19,7 +19,7 @@ limitations under the License. package horizontalpodautoscaler import ( - "context" + context "context" v2beta1 "k8s.io/client-go/informers/autoscaling/v2beta1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/fake/fake.go index 2f2904a4..e9fe523c 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" job "knative.dev/pkg/client/injection/kube/informers/batch/v1/job" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/job.go b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/job.go index b31f3d23..56ab761c 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/job.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1/job/job.go @@ -19,7 +19,7 @@ limitations under the License. package job import ( - "context" + context "context" v1 "k8s.io/client-go/informers/batch/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/cronjob.go b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/cronjob.go index 36faede0..781966df 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/cronjob.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/cronjob.go @@ -19,7 +19,7 @@ limitations under the License. package cronjob import ( - "context" + context "context" v1beta1 "k8s.io/client-go/informers/batch/v1beta1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/fake/fake.go index fa03fd3b..5d99d060 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" cronjob "knative.dev/pkg/client/injection/kube/informers/batch/v1beta1/cronjob" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/componentstatus.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/componentstatus.go index 70487284..e789e9ab 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/componentstatus.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/componentstatus.go @@ -19,7 +19,7 @@ limitations under the License. package componentstatus import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/fake/fake.go index 26b2531d..bd425541 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" componentstatus "knative.dev/pkg/client/injection/kube/informers/core/v1/componentstatus" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/configmap.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/configmap.go index a48eb395..17c85454 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/configmap.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/configmap.go @@ -19,7 +19,7 @@ limitations under the License. package configmap import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/fake/fake.go index 6f693c7f..73a324fa 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/configmap/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" configmap "knative.dev/pkg/client/injection/kube/informers/core/v1/configmap" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/endpoints.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/endpoints.go index 95c3b0fa..3b6a9674 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/endpoints.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/endpoints.go @@ -19,7 +19,7 @@ limitations under the License. package endpoints import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/fake/fake.go index e2b3dbf0..0a2528bb 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" endpoints "knative.dev/pkg/client/injection/kube/informers/core/v1/endpoints" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/event.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/event.go index b4242581..36ab9549 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/event.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/event.go @@ -19,7 +19,7 @@ limitations under the License. package event import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/fake/fake.go index b3959730..a60f0163 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/event/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" event "knative.dev/pkg/client/injection/kube/informers/core/v1/event" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/fake/fake.go index 9cf84517..823c8687 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" limitrange "knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/limitrange.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/limitrange.go index f6635cbc..bc6971b6 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/limitrange.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/limitrange/limitrange.go @@ -19,7 +19,7 @@ limitations under the License. package limitrange import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/fake/fake.go index 38103361..db3ebe17 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" namespace "knative.dev/pkg/client/injection/kube/informers/core/v1/namespace" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/namespace.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/namespace.go index 8fdd3070..f8a43dcc 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/namespace.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/namespace/namespace.go @@ -19,7 +19,7 @@ limitations under the License. package namespace import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/fake/fake.go index e984515f..cb125081 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" node "knative.dev/pkg/client/injection/kube/informers/core/v1/node" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/node.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/node.go index 1614ff31..cf5ef01f 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/node.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/node/node.go @@ -19,7 +19,7 @@ limitations under the License. package node import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/fake/fake.go index 1aa65f90..8d4e993d 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" persistentvolume "knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/persistentvolume.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/persistentvolume.go index 6120af88..9ce657f0 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/persistentvolume.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolume/persistentvolume.go @@ -19,7 +19,7 @@ limitations under the License. package persistentvolume import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/fake/fake.go index 5fea9bc7..3d7013a2 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" persistentvolumeclaim "knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/persistentvolumeclaim.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/persistentvolumeclaim.go index 20ec2c4b..289aa78f 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/persistentvolumeclaim.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/persistentvolumeclaim/persistentvolumeclaim.go @@ -19,7 +19,7 @@ limitations under the License. package persistentvolumeclaim import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/fake/fake.go index 8280c9d0..ae10b345 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" pod "knative.dev/pkg/client/injection/kube/informers/core/v1/pod" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/pod.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/pod.go index 5670005a..8f8a6fff 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/pod.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/pod/pod.go @@ -19,7 +19,7 @@ limitations under the License. package pod import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/fake/fake.go index e597bf54..0269e008 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" podtemplate "knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/podtemplate.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/podtemplate.go index cd89ffa8..15a3b7a7 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/podtemplate.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/podtemplate/podtemplate.go @@ -19,7 +19,7 @@ limitations under the License. package podtemplate import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/fake/fake.go index 8b4d079e..7df67d69 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" replicationcontroller "knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/replicationcontroller.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/replicationcontroller.go index 23f3f051..3ced1b1a 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/replicationcontroller.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/replicationcontroller/replicationcontroller.go @@ -19,7 +19,7 @@ limitations under the License. package replicationcontroller import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/fake/fake.go index abc71306..84c8517c 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" resourcequota "knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/resourcequota.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/resourcequota.go index 824e24ed..e83a255f 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/resourcequota.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/resourcequota/resourcequota.go @@ -19,7 +19,7 @@ limitations under the License. package resourcequota import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go index e1fb2748..48b2532d 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" secret "knative.dev/pkg/client/injection/kube/informers/core/v1/secret" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go index 396f384a..5442d08b 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/secret/secret.go @@ -19,7 +19,7 @@ limitations under the License. package secret import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake/fake.go index b7a3c3dd..d7ecc65b 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" service "knative.dev/pkg/client/injection/kube/informers/core/v1/service" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/service.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/service.go index 83e454ae..e80633a3 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/service.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/service/service.go @@ -19,7 +19,7 @@ limitations under the License. package service import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake/fake.go index 2373d3c4..a699f744 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" serviceaccount "knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/serviceaccount.go b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/serviceaccount.go index e0258f37..8505a10e 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/serviceaccount.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/core/v1/serviceaccount/serviceaccount.go @@ -19,7 +19,7 @@ limitations under the License. package serviceaccount import ( - "context" + context "context" v1 "k8s.io/client-go/informers/core/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/factory/factory.go b/vendor/knative.dev/pkg/client/injection/kube/informers/factory/factory.go index dc2a63f8..7b9e9ab9 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/factory/factory.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/factory/factory.go @@ -19,7 +19,7 @@ limitations under the License. package factory import ( - "context" + context "context" informers "k8s.io/client-go/informers" client "knative.dev/pkg/client/injection/kube/client" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/factory/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/factory/fake/fake.go index eba32e29..5784115f 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/factory/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/factory/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" informers "k8s.io/client-go/informers" fake "knative.dev/pkg/client/injection/kube/client/fake" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/clusterrole.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/clusterrole.go index b6aeafd1..7ffb44f1 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/clusterrole.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/clusterrole.go @@ -19,7 +19,7 @@ limitations under the License. package clusterrole import ( - "context" + context "context" v1 "k8s.io/client-go/informers/rbac/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/fake/fake.go index a8911704..60fc2614 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" clusterrole "knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrole" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/clusterrolebinding.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/clusterrolebinding.go index 8b584b37..6a6ea6a0 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/clusterrolebinding.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/clusterrolebinding.go @@ -19,7 +19,7 @@ limitations under the License. package clusterrolebinding import ( - "context" + context "context" v1 "k8s.io/client-go/informers/rbac/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/fake/fake.go index 4cd336b4..12ae6de7 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" clusterrolebinding "knative.dev/pkg/client/injection/kube/informers/rbac/v1/clusterrolebinding" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/fake/fake.go index 85cbb529..a6cca085 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" role "knative.dev/pkg/client/injection/kube/informers/rbac/v1/role" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/role.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/role.go index df53f4a8..c3f537f7 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/role.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/role/role.go @@ -19,7 +19,7 @@ limitations under the License. package role import ( - "context" + context "context" v1 "k8s.io/client-go/informers/rbac/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/fake/fake.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/fake/fake.go index 2c72d397..d50dc9f2 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/fake/fake.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/fake/fake.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - "context" + context "context" fake "knative.dev/pkg/client/injection/kube/informers/factory/fake" rolebinding "knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding" diff --git a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/rolebinding.go b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/rolebinding.go index 54ba78f8..c5025e5a 100644 --- a/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/rolebinding.go +++ b/vendor/knative.dev/pkg/client/injection/kube/informers/rbac/v1/rolebinding/rolebinding.go @@ -19,7 +19,7 @@ limitations under the License. package rolebinding import ( - "context" + context "context" v1 "k8s.io/client-go/informers/rbac/v1" factory "knative.dev/pkg/client/injection/kube/informers/factory" diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/client.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/client.go index 6d7ccf5c..98031adb 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/client.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/client.go @@ -71,6 +71,10 @@ func (g *clientGenerator) GenerateType(c *generator.Context, t *types.Type, w io Package: "knative.dev/pkg/logging", Name: "FromContext", }), + "contextContext": c.Universe.Type(types.Name{ + Package: "context", + Name: "Context", + }), } sw.Do(injectionClient, m) @@ -86,12 +90,12 @@ func init() { // Key is used as the key for associating information with a context.Context. type Key struct{} -func withClient(ctx context.Context, cfg *{{.restConfig|raw}}) context.Context { +func withClient(ctx {{.contextContext|raw}}, cfg *{{.restConfig|raw}}) context.Context { return context.WithValue(ctx, Key{}, {{.clientSetNewForConfigOrDie|raw}}(cfg)) } // Get extracts the {{.clientSetInterface|raw}} client from the context. -func Get(ctx context.Context) {{.clientSetInterface|raw}} { +func Get(ctx {{.contextContext|raw}}) {{.clientSetInterface|raw}} { untyped := ctx.Value(Key{}) if untyped == nil { {{.loggingFromContext|raw}}(ctx).Panic( diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/duck.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/duck.go index b755ce7d..bc77f9e5 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/duck.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/duck.go @@ -90,6 +90,10 @@ func (g *duckGenerator) GenerateType(c *generator.Context, t *types.Type, w io.W Package: "knative.dev/pkg/logging", Name: "FromContext", }), + "contextContext": c.Universe.Type(types.Name{ + Package: "context", + Name: "Context", + }), } sw.Do(duckFactory, m) @@ -105,7 +109,7 @@ func init() { // Key is used for associating the Informer inside the context.Context. type Key struct{} -func WithDuck(ctx context.Context) context.Context { +func WithDuck(ctx {{.contextContext|raw}}) {{.contextContext|raw}} { dc := {{.dynamicGet|raw}}(ctx) dif := &{{.duckCachedInformerFactory|raw}}{ Delegate: &{{.duckTypedInformerFactory|raw}}{ @@ -119,7 +123,7 @@ func WithDuck(ctx context.Context) context.Context { } // Get extracts the typed informer from the context. -func Get(ctx context.Context) {{.duckInformerFactory|raw}} { +func Get(ctx {{.contextContext|raw}}) {{.duckInformerFactory|raw}} { untyped := ctx.Value(Key{}) if untyped == nil { {{.loggingFromContext|raw}}(ctx).Panic( diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/factory.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/factory.go index 6dcb47c3..ac0c242c 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/factory.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/factory.go @@ -77,6 +77,10 @@ func (g *factoryGenerator) GenerateType(c *generator.Context, t *types.Type, w i Package: "knative.dev/pkg/logging", Name: "FromContext", }), + "contextContext": c.Universe.Type(types.Name{ + Package: "context", + Name: "Context", + }), } sw.Do(injectionFactory, m) @@ -92,7 +96,7 @@ func init() { // Key is used as the key for associating information with a context.Context. type Key struct{} -func withInformerFactory(ctx context.Context) context.Context { +func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} { c := {{.cachingClientGet|raw}}(ctx) opts := make([]{{.informersSharedInformerOption|raw}}, 0, 1) if {{.injectionHasNamespace|raw}}(ctx) { @@ -103,7 +107,7 @@ func withInformerFactory(ctx context.Context) context.Context { } // Get extracts the InformerFactory from the context. -func Get(ctx context.Context) {{.informersSharedInformerFactory|raw}} { +func Get(ctx {{.contextContext|raw}}) {{.informersSharedInformerFactory|raw}} { untyped := ctx.Value(Key{}) if untyped == nil { {{.loggingFromContext|raw}}(ctx).Panic( diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeclient.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeclient.go index 001170a7..277ddab6 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeclient.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeclient.go @@ -75,6 +75,12 @@ func (g *fakeClientGenerator) GenerateType(c *generator.Context, t *types.Type, Package: "knative.dev/pkg/logging", Name: "FromContext", }), + "contextContext": c.Universe.Type(types.Name{ + Package: "context", + Name: "Context", + }), + "restConfig": c.Universe.Type(types.Name{Package: "k8s.io/client-go/rest", Name: "Config"}), + "runtimeObject": c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "Object"}), } sw.Do(injectionFakeClient, m) @@ -87,18 +93,18 @@ func init() { {{.injectionRegisterClient|raw}}(withClient) } -func withClient(ctx context.Context, cfg *rest.Config) context.Context { +func withClient(ctx {{.contextContext|raw}}, cfg *{{.restConfig|raw}}) {{.contextContext|raw}} { ctx, _ = With(ctx) return ctx } -func With(ctx context.Context, objects ...runtime.Object) (context.Context, *{{.fakeClient|raw}}) { +func With(ctx {{.contextContext|raw}}, objects ...{{.runtimeObject|raw}}) ({{.contextContext|raw}}, *{{.fakeClient|raw}}) { cs := fake.NewSimpleClientset(objects...) return context.WithValue(ctx, {{.clientKey|raw}}{}, cs), cs } // Get extracts the Kubernetes client from the context. -func Get(ctx context.Context) *{{.fakeClient|raw}} { +func Get(ctx {{.contextContext|raw}}) *{{.fakeClient|raw}} { untyped := ctx.Value({{.clientKey|raw}}{}) if untyped == nil { {{.loggingFromContext|raw}}(ctx).Panic( diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakefactory.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakefactory.go index 8b71a7de..cd145d7e 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakefactory.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakefactory.go @@ -79,6 +79,10 @@ func (g *fakeFactoryGenerator) GenerateType(c *generator.Context, t *types.Type, "injectionHasNamespace": c.Universe.Type(types.Name{Package: "knative.dev/pkg/injection", Name: "HasNamespaceScope"}), "injectionGetNamespace": c.Universe.Type(types.Name{Package: "knative.dev/pkg/injection", Name: "GetNamespaceScope"}), "controllerGetResyncPeriod": c.Universe.Type(types.Name{Package: "knative.dev/pkg/controller", Name: "GetResyncPeriod"}), + "contextContext": c.Universe.Type(types.Name{ + Package: "context", + Name: "Context", + }), } sw.Do(injectionFakeInformerFactory, m) @@ -93,7 +97,7 @@ func init() { {{.injectionRegisterInformerFactory|raw}}(withInformerFactory) } -func withInformerFactory(ctx context.Context) context.Context { +func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} { c := {{.clientGet|raw}}(ctx) opts := make([]{{.informersSharedInformerOption|raw}}, 0, 1) if {{.injectionHasNamespace|raw}}(ctx) { diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go index d0a93f52..9fbd8bf9 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fakeinformer.go @@ -91,6 +91,10 @@ func (g *fakeInformerGenerator) GenerateType(c *generator.Context, t *types.Type Package: "knative.dev/pkg/injection", Name: "Fake.RegisterInformer", }), + "contextContext": c.Universe.Type(types.Name{ + Package: "context", + Name: "Context", + }), } sw.Do(injectionFakeInformer, m) @@ -105,7 +109,7 @@ func init() { {{.injectionRegisterInformer|raw}}(withInformer) } -func withInformer(ctx context.Context) (context.Context, {{.controllerInformer|raw}}) { +func withInformer(ctx {{.contextContext|raw}}) ({{.contextContext|raw}}, {{.controllerInformer|raw}}) { f := {{.factoryGet|raw}}(ctx) inf := f.{{.group}}().{{.version}}().{{.type|publicPlural}}() return context.WithValue(ctx, {{.informerKey|raw}}{}, inf), inf.Informer() diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/informer.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/informer.go index 9fd23811..00f79ee8 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/informer.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/informer.go @@ -90,6 +90,10 @@ func (g *injectionGenerator) GenerateType(c *generator.Context, t *types.Type, w Package: "knative.dev/pkg/logging", Name: "FromContext", }), + "contextContext": c.Universe.Type(types.Name{ + Package: "context", + Name: "Context", + }), } sw.Do(injectionInformer, m) @@ -105,14 +109,14 @@ func init() { // Key is used for associating the Informer inside the context.Context. type Key struct{} -func withInformer(ctx context.Context) (context.Context, {{.controllerInformer|raw}}) { +func withInformer(ctx {{.contextContext|raw}}) ({{.contextContext|raw}}, {{.controllerInformer|raw}}) { f := {{.factoryGet|raw}}(ctx) inf := f.{{.group}}().{{.version}}().{{.type|publicPlural}}() return context.WithValue(ctx, Key{}, inf), inf.Informer() } // Get extracts the typed informer from the context. -func Get(ctx context.Context) {{.informersTypedInformer|raw}} { +func Get(ctx {{.contextContext|raw}}) {{.informersTypedInformer|raw}} { untyped := ctx.Value(Key{}) if untyped == nil { {{.loggingFromContext|raw}}(ctx).Panic( diff --git a/vendor/knative.dev/pkg/injection/sharedmain/main.go b/vendor/knative.dev/pkg/injection/sharedmain/main.go index 0e97b198..e25a0665 100644 --- a/vendor/knative.dev/pkg/injection/sharedmain/main.go +++ b/vendor/knative.dev/pkg/injection/sharedmain/main.go @@ -93,120 +93,113 @@ func GetLoggingConfig(ctx context.Context) (*logging.Config, error) { return logging.NewConfigFromConfigMap(loggingConfigMap) } +// Main runs the generic main flow for non-webhook controllers with a new +// context. Use WebhookMainWith* if you need to serve webhooks. func Main(component string, ctors ...injection.ControllerConstructor) { // Set up signals so we handle the first shutdown signal gracefully. MainWithContext(signals.NewContext(), component, ctors...) } +// MainWithContext runs the generic main flow for non-webhook controllers. Use +// WebhookMainWithContext if you need to serve webhooks. func MainWithContext(ctx context.Context, component string, ctors ...injection.ControllerConstructor) { - var ( - masterURL = flag.String("master", "", - "The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.") - kubeconfig = flag.String("kubeconfig", "", - "Path to a kubeconfig. Only required if out-of-cluster.") - ) - flag.Parse() - - cfg, err := GetConfig(*masterURL, *kubeconfig) - if err != nil { - log.Fatalf("Error building kubeconfig: %v", err) - } - MainWithConfig(ctx, component, cfg, ctors...) + MainWithConfig(ctx, component, ParseAndGetConfigOrDie(), ctors...) } +// MainWithConfig runs the generic main flow for non-webhook controllers. Use +// WebhookMainWithConfig if you need to serve webhooks. func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, ctors ...injection.ControllerConstructor) { log.Printf("Registering %d clients", len(injection.Default.GetClients())) log.Printf("Registering %d informer factories", len(injection.Default.GetInformerFactories())) log.Printf("Registering %d informers", len(injection.Default.GetInformers())) log.Printf("Registering %d controllers", len(ctors)) - // Report stats on Go memory usage every 30 seconds. - msp := metrics.NewMemStatsAll() - msp.Start(ctx, 30*time.Second) + MemStatsOrDie(ctx) - if err := view.Register(msp.DefaultViews()...); err != nil { - log.Fatalf("Error exporting go memstats view: %v", err) - } - - // Adjust our client's rate limits based on the number of controller's we are running. + // Adjust our client's rate limits based on the number of controllers we are running. cfg.QPS = float32(len(ctors)) * rest.DefaultQPS cfg.Burst = len(ctors) * rest.DefaultBurst ctx, informers := injection.Default.SetupInformers(ctx, cfg) - // Set up our logger. - loggingConfig, err := GetLoggingConfig(ctx) - if err != nil { - log.Fatalf("Error reading/parsing logging configuration: %v", err) - } - logger, atomicLevel := logging.NewLoggerFromConfig(loggingConfig, component) + logger, atomicLevel := SetupLoggerOrDie(ctx, component) defer flush(logger) ctx = logging.WithLogger(ctx, logger) - - // Obtain K8s clientset. - kc := kubeclient.Get(ctx) - if err := version.CheckMinimumVersion(kc.Discovery()); err != nil { - logger.Fatalw("Version check failed", zap.Error(err)) - } - - // Create ConfigMaps watcher with optional label-based filter. - var cmLabelReqs []labels.Requirement - if cmLabel := system.ResourceLabel(); cmLabel != "" { - req, err := configmap.FilterConfigByLabelExists(cmLabel) - if err != nil { - logger.With(zap.Error(err)).Fatalf("Failed to generate requirement for label %q") - } - logger.Infof("Setting up ConfigMap watcher with label selector %q", req) - cmLabelReqs = append(cmLabelReqs, *req) - } - // TODO(mattmoor): This should itself take a context and be injection-based. - cmw := configmap.NewInformedWatcher(kc, system.Namespace(), cmLabelReqs...) - - // Based on the reconcilers we have linked, build up the set of controllers to run. - controllers := make([]*controller.Impl, 0, len(ctors)) - webhooks := make([]interface{}, 0) - for _, cf := range ctors { - ctrl := cf(ctx, cmw) - controllers = append(controllers, ctrl) - - // Build a list of any reconcilers that implement webhook.AdmissionController - switch c := ctrl.Reconciler.(type) { - case webhook.AdmissionController, webhook.ConversionController: - webhooks = append(webhooks, c) - } - } - profilingHandler := profiling.NewHandler(logger, false) - // Watch the logging config map and dynamically update logging levels. - if _, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(logging.ConfigMapName(), - metav1.GetOptions{}); err == nil { - cmw.Watch(logging.ConfigMapName(), logging.UpdateLevelFromConfigMap(logger, atomicLevel, component)) - } else if !apierrors.IsNotFound(err) { - logger.With(zap.Error(err)).Fatalf("Error reading ConfigMap %q", logging.ConfigMapName()) - } - - // Watch the observability config map - if _, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(metrics.ConfigMapName(), - metav1.GetOptions{}); err == nil { - cmw.Watch(metrics.ConfigMapName(), - metrics.UpdateExporterFromConfigMap(component, logger), - profilingHandler.UpdateFromConfigMap) - } else if !apierrors.IsNotFound(err) { - logger.With(zap.Error(err)).Fatalf("Error reading ConfigMap %q", metrics.ConfigMapName()) - } + CheckK8sClientMinimumVersionOrDie(ctx, logger) + cmw := SetupConfigMapWatchOrDie(ctx, logger) + controllers, _ := ControllersAndWebhooksFromCtors(ctx, cmw, ctors...) + WatchLoggingConfigOrDie(ctx, cmw, logger, atomicLevel, component) + WatchObservabilityConfigOrDie(ctx, cmw, profilingHandler, logger, component) + logger.Info("Starting configuration manager...") if err := cmw.Start(ctx.Done()); err != nil { logger.Fatalw("Failed to start configuration manager", zap.Error(err)) } - - // Start all of the informers and wait for them to sync. - logger.Info("Starting informers.") + logger.Info("Starting informers...") if err := controller.StartInformers(ctx.Done(), informers...); err != nil { logger.Fatalw("Failed to start informers", zap.Error(err)) } + logger.Info("Starting controllers...") + go controller.StartAll(ctx.Done(), controllers...) - // Start all of the controllers. + profilingServer := profiling.NewServer(profilingHandler) + eg, egCtx := errgroup.WithContext(ctx) + eg.Go(profilingServer.ListenAndServe) + + // This will block until either a signal arrives or one of the grouped functions + // returns an error. + <-egCtx.Done() + + profilingServer.Shutdown(context.Background()) + // Don't forward ErrServerClosed as that indicates we're already shutting down. + if err := eg.Wait(); err != nil && err != http.ErrServerClosed { + logger.Errorw("Error while running server", zap.Error(err)) + } +} + +// WebhookMainWithContext runs the generic main flow for controllers and +// webhooks. Use MainWithContext if you do not need to serve webhooks. +func WebhookMainWithContext(ctx context.Context, component string, ctors ...injection.ControllerConstructor) { + WebhookMainWithConfig(ctx, component, ParseAndGetConfigOrDie(), ctors...) +} + +// WebhookMainWithConfig runs the generic main flow for controllers and webhooks +// with the given config. Use MainWithConfig if you do not need to serve +// webhooks. +func WebhookMainWithConfig(ctx context.Context, component string, cfg *rest.Config, ctors ...injection.ControllerConstructor) { + log.Printf("Registering %d clients", len(injection.Default.GetClients())) + log.Printf("Registering %d informer factories", len(injection.Default.GetInformerFactories())) + log.Printf("Registering %d informers", len(injection.Default.GetInformers())) + log.Printf("Registering %d controllers", len(ctors)) + + MemStatsOrDie(ctx) + + // Adjust our client's rate limits based on the number of controllers we are running. + cfg.QPS = float32(len(ctors)) * rest.DefaultQPS + cfg.Burst = len(ctors) * rest.DefaultBurst + ctx, informers := injection.Default.SetupInformers(ctx, cfg) + + logger, atomicLevel := SetupLoggerOrDie(ctx, component) + defer flush(logger) + ctx = logging.WithLogger(ctx, logger) + profilingHandler := profiling.NewHandler(logger, false) + + CheckK8sClientMinimumVersionOrDie(ctx, logger) + cmw := SetupConfigMapWatchOrDie(ctx, logger) + controllers, webhooks := ControllersAndWebhooksFromCtors(ctx, cmw, ctors...) + WatchLoggingConfigOrDie(ctx, cmw, logger, atomicLevel, component) + WatchObservabilityConfigOrDie(ctx, cmw, profilingHandler, logger, component) + + logger.Info("Starting configuration manager...") + if err := cmw.Start(ctx.Done()); err != nil { + logger.Fatalw("Failed to start configuration manager", zap.Error(err)) + } + logger.Info("Starting informers...") + if err := controller.StartInformers(ctx.Done(), informers...); err != nil { + logger.Fatalw("Failed to start informers", zap.Error(err)) + } logger.Info("Starting controllers...") go controller.StartAll(ctx.Done(), controllers...) @@ -245,3 +238,117 @@ func flush(logger *zap.SugaredLogger) { logger.Sync() metrics.FlushExporter() } + +// ParseAndGetConfigOrDie parses the rest config flags and creates a client or +// dies by calling log.Fatalf. +func ParseAndGetConfigOrDie() *rest.Config { + var ( + masterURL = flag.String("master", "", + "The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.") + kubeconfig = flag.String("kubeconfig", "", + "Path to a kubeconfig. Only required if out-of-cluster.") + ) + flag.Parse() + + cfg, err := GetConfig(*masterURL, *kubeconfig) + if err != nil { + log.Fatalf("Error building kubeconfig: %v", err) + } + + return cfg +} + +// MemStatsOrDie sets up reporting on Go memory usage every 30 seconds or dies +// by calling log.Fatalf. +func MemStatsOrDie(ctx context.Context) { + msp := metrics.NewMemStatsAll() + msp.Start(ctx, 30*time.Second) + + if err := view.Register(msp.DefaultViews()...); err != nil { + log.Fatalf("Error exporting go memstats view: %v", err) + } +} + +// SetupLoggerOrDie sets up the logger using the config from the given context +// and returns a logger and atomic level, or dies by calling log.Fatalf. +func SetupLoggerOrDie(ctx context.Context, component string) (*zap.SugaredLogger, zap.AtomicLevel) { + loggingConfig, err := GetLoggingConfig(ctx) + if err != nil { + log.Fatalf("Error reading/parsing logging configuration: %v", err) + } + return logging.NewLoggerFromConfig(loggingConfig, component) +} + +// CheckK8sClientMinimumVersionOrDie checks that the hosting Kubernetes cluster +// is at least the minimum allowable version or dies by calling log.Fatalf. +func CheckK8sClientMinimumVersionOrDie(ctx context.Context, logger *zap.SugaredLogger) { + kc := kubeclient.Get(ctx) + if err := version.CheckMinimumVersion(kc.Discovery()); err != nil { + logger.Fatalw("Version check failed", zap.Error(err)) + } +} + +// SetupConfigMapWatchOrDie establishes a watch of the configmaps in the system +// namespace that are labeled to be watched or dies by calling log.Fatalf. +func SetupConfigMapWatchOrDie(ctx context.Context, logger *zap.SugaredLogger) *configmap.InformedWatcher { + kc := kubeclient.Get(ctx) + // Create ConfigMaps watcher with optional label-based filter. + var cmLabelReqs []labels.Requirement + if cmLabel := system.ResourceLabel(); cmLabel != "" { + req, err := configmap.FilterConfigByLabelExists(cmLabel) + if err != nil { + logger.With(zap.Error(err)).Fatalf("Failed to generate requirement for label %q") + } + logger.Infof("Setting up ConfigMap watcher with label selector %q", req) + cmLabelReqs = append(cmLabelReqs, *req) + } + // TODO(mattmoor): This should itself take a context and be injection-based. + return configmap.NewInformedWatcher(kc, system.Namespace(), cmLabelReqs...) +} + +// WatchLoggingConfigOrDie establishes a watch of the logging config or dies by +// calling log.Fatalf. Note, if the config does not exist, it will be defaulted +// and this method will not die. +func WatchLoggingConfigOrDie(ctx context.Context, cmw *configmap.InformedWatcher, logger *zap.SugaredLogger, atomicLevel zap.AtomicLevel, component string) { + if _, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(logging.ConfigMapName(), + metav1.GetOptions{}); err == nil { + cmw.Watch(logging.ConfigMapName(), logging.UpdateLevelFromConfigMap(logger, atomicLevel, component)) + } else if !apierrors.IsNotFound(err) { + logger.With(zap.Error(err)).Fatalf("Error reading ConfigMap %q", logging.ConfigMapName()) + } +} + +// WatchObservabilityConfigOrDie establishes a watch of the logging config or +// dies by calling log.Fatalf. Note, if the config does not exist, it will be +// defaulted and this method will not die. +func WatchObservabilityConfigOrDie(ctx context.Context, cmw *configmap.InformedWatcher, profilingHandler *profiling.Handler, logger *zap.SugaredLogger, component string) { + if _, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(metrics.ConfigMapName(), + metav1.GetOptions{}); err == nil { + cmw.Watch(metrics.ConfigMapName(), + metrics.UpdateExporterFromConfigMap(component, logger), + profilingHandler.UpdateFromConfigMap) + } else if !apierrors.IsNotFound(err) { + logger.With(zap.Error(err)).Fatalf("Error reading ConfigMap %q", metrics.ConfigMapName()) + } +} + +// ControllersAndWebhooksFromCtors returns a list of the controllers and a list +// of the webhooks created from the given constructors. +func ControllersAndWebhooksFromCtors(ctx context.Context, + cmw *configmap.InformedWatcher, + ctors ...injection.ControllerConstructor) ([]*controller.Impl, []interface{}) { + controllers := make([]*controller.Impl, 0, len(ctors)) + webhooks := make([]interface{}, 0) + for _, cf := range ctors { + ctrl := cf(ctx, cmw) + controllers = append(controllers, ctrl) + + // Build a list of any reconcilers that implement webhook.AdmissionController + switch c := ctrl.Reconciler.(type) { + case webhook.AdmissionController, webhook.ConversionController: + webhooks = append(webhooks, c) + } + } + + return controllers, webhooks +} diff --git a/vendor/knative.dev/pkg/reconciler/testing/stats.go b/vendor/knative.dev/pkg/reconciler/testing/stats.go deleted file mode 100644 index 1d389a15..00000000 --- a/vendor/knative.dev/pkg/reconciler/testing/stats.go +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2019 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 testing - -import ( - "fmt" - "time" -) - -// FakeStatsReporter is a fake implementation of StatsReporter -type FakeStatsReporter struct { - servicesReady map[string]int -} - -func (r *FakeStatsReporter) ReportServiceReady(namespace, service string, d time.Duration) error { - key := fmt.Sprintf("%s/%s", namespace, service) - if r.servicesReady == nil { - r.servicesReady = make(map[string]int) - } - r.servicesReady[key]++ - return nil -} - -func (r *FakeStatsReporter) GetServiceReadyStats() map[string]int { - return r.servicesReady -} diff --git a/vendor/knative.dev/pkg/reconciler/testing/table.go b/vendor/knative.dev/pkg/reconciler/testing/table.go index 61438fa6..38a891f2 100644 --- a/vendor/knative.dev/pkg/reconciler/testing/table.go +++ b/vendor/knative.dev/pkg/reconciler/testing/table.go @@ -79,9 +79,6 @@ type TableRow struct { // WantEvents holds the ordered list of events we expect during reconciliation. WantEvents []string - // WantServiceReadyStats holds the ServiceReady stats we expect during reconciliation. - WantServiceReadyStats map[string]int - // WithReactors is a set of functions that are installed as Reactors for the execution // of this row of the table-driven-test. WithReactors []clientgotesting.ReactionFunc @@ -123,15 +120,14 @@ func objKey(o runtime.Object) string { return path.Join(typeOf, on.GetNamespace(), on.GetName()) } -// Factory returns a Reconciler.Interface to perform reconciliation in table test, -// ActionRecorderList/EventList to capture k8s actions/events produced during reconciliation -// and FakeStatsReporter to capture stats. -type Factory func(*testing.T, *TableRow) (controller.Reconciler, ActionRecorderList, EventList, *FakeStatsReporter) +// Factory returns a Reconciler.Interface to perform reconciliation in table test, and +// ActionRecorderList/EventList to capture k8s actions/events produced during reconciliation. +type Factory func(*testing.T, *TableRow) (controller.Reconciler, ActionRecorderList, EventList) // Test executes the single table test. func (r *TableRow) Test(t *testing.T, factory Factory) { t.Helper() - c, recorderList, eventList, statsReporter := factory(t, r) + c, recorderList, eventList := factory(t, r) // Set the Reconciler for PostConditions to access it post-Reconcile() r.Reconciler = c @@ -355,11 +351,6 @@ func (r *TableRow) Test(t *testing.T, factory Factory) { } } - gotStats := statsReporter.GetServiceReadyStats() - if diff := cmp.Diff(r.WantServiceReadyStats, gotStats); diff != "" { - t.Errorf("Unexpected service ready stats (-want, +got): %s", diff) - } - for _, verify := range r.PostConditions { verify(t, r) } diff --git a/vendor/knative.dev/pkg/test/webhook-apicoverage/webhook/webhook.go b/vendor/knative.dev/pkg/test/webhook-apicoverage/webhook/webhook.go index 9c438147..1c9be044 100644 --- a/vendor/knative.dev/pkg/test/webhook-apicoverage/webhook/webhook.go +++ b/vendor/knative.dev/pkg/test/webhook-apicoverage/webhook/webhook.go @@ -85,7 +85,7 @@ type APICoverageWebhook struct { } func (acw *APICoverageWebhook) generateServerConfig() (*tls.Config, error) { - serverKey, serverCert, caCert, err := certresources.CreateCerts(context.Background(), acw.ServiceName, acw.Namespace) + serverKey, serverCert, caCert, err := certresources.CreateCerts(context.Background(), acw.ServiceName, acw.Namespace, time.Now().AddDate(1, 0, 0)) if err != nil { return nil, fmt.Errorf("Error creating webhook certificates: %v", err) } diff --git a/vendor/knative.dev/pkg/webhook/certificates/certificates.go b/vendor/knative.dev/pkg/webhook/certificates/certificates.go index a05f38e4..e01242bc 100644 --- a/vendor/knative.dev/pkg/webhook/certificates/certificates.go +++ b/vendor/knative.dev/pkg/webhook/certificates/certificates.go @@ -18,6 +18,9 @@ package certificates import ( "context" + "crypto/tls" + "crypto/x509" + "time" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" @@ -28,6 +31,11 @@ import ( certresources "knative.dev/pkg/webhook/certificates/resources" ) +const ( + // Time used for updating a certificate before it expires. Default 1 week. + oneWeek = 7 * 24 * time.Hour +) + type reconciler struct { client kubernetes.Interface secretlister corelisters.SecretLister @@ -67,8 +75,18 @@ func (r *reconciler) reconcileCertificate(ctx context.Context) error { } else if _, haskey := secret.Data[certresources.CACert]; !haskey { logger.Infof("Certificate secret %q is missing key %q", r.secretName, certresources.CACert) } else { - // It has all of the keys, it's good. - return nil + // Check the expiration date of the certificate to see if it needs to be updated + cert, err := tls.X509KeyPair(secret.Data[certresources.ServerCert], secret.Data[certresources.ServerKey]) + if err != nil { + logger.Warnf("Error creating pem from certificate and key: %v", err) + } else { + certData, err := x509.ParseCertificate(cert.Certificate[0]) + if err != nil { + logger.Errorf("Error parsing certificate: %v", err) + } else if time.Now().Add(oneWeek).Before(certData.NotAfter) { + return nil + } + } } // Don't modify the informer copy. secret = secret.DeepCopy() diff --git a/vendor/knative.dev/pkg/webhook/certificates/resources/certs.go b/vendor/knative.dev/pkg/webhook/certificates/resources/certs.go index aaa0b78a..a9d5bee4 100644 --- a/vendor/knative.dev/pkg/webhook/certificates/resources/certs.go +++ b/vendor/knative.dev/pkg/webhook/certificates/resources/certs.go @@ -38,7 +38,7 @@ const ( // Create the common parts of the cert. These don't change between // the root/CA cert and the server cert. -func createCertTemplate(name, namespace string) (*x509.Certificate, error) { +func createCertTemplate(name, namespace string, notAfter time.Time) (*x509.Certificate, error) { serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128) serialNumber, err := rand.Int(rand.Reader, serialNumberLimit) if err != nil { @@ -58,7 +58,7 @@ func createCertTemplate(name, namespace string) (*x509.Certificate, error) { Subject: pkix.Name{Organization: []string{organization}}, SignatureAlgorithm: x509.SHA256WithRSA, NotBefore: time.Now(), - NotAfter: time.Now().AddDate(1, 0, 0), // valid for 1 years + NotAfter: notAfter, BasicConstraintsValid: true, DNSNames: serviceNames, } @@ -66,8 +66,8 @@ func createCertTemplate(name, namespace string) (*x509.Certificate, error) { } // Create cert template suitable for CA and hence signing -func createCACertTemplate(name, namespace string) (*x509.Certificate, error) { - rootCert, err := createCertTemplate(name, namespace) +func createCACertTemplate(name, namespace string, notAfter time.Time) (*x509.Certificate, error) { + rootCert, err := createCertTemplate(name, namespace, notAfter) if err != nil { return nil, err } @@ -79,8 +79,8 @@ func createCACertTemplate(name, namespace string) (*x509.Certificate, error) { } // Create cert template that we can use on the server for TLS -func createServerCertTemplate(name, namespace string) (*x509.Certificate, error) { - serverCert, err := createCertTemplate(name, namespace) +func createServerCertTemplate(name, namespace string, notAfter time.Time) (*x509.Certificate, error) { + serverCert, err := createCertTemplate(name, namespace, notAfter) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func createCert(template, parent *x509.Certificate, pub interface{}, parentPriv return } -func createCA(ctx context.Context, name, namespace string) (*rsa.PrivateKey, *x509.Certificate, []byte, error) { +func createCA(ctx context.Context, name, namespace string, notAfter time.Time) (*rsa.PrivateKey, *x509.Certificate, []byte, error) { logger := logging.FromContext(ctx) rootKey, err := rsa.GenerateKey(rand.Reader, 2048) if err != nil { @@ -114,7 +114,7 @@ func createCA(ctx context.Context, name, namespace string) (*rsa.PrivateKey, *x5 return nil, nil, nil, err } - rootCertTmpl, err := createCACertTemplate(name, namespace) + rootCertTmpl, err := createCACertTemplate(name, namespace, notAfter) if err != nil { logger.Errorw("error generating CA cert", zap.Error(err)) return nil, nil, nil, err @@ -131,11 +131,12 @@ func createCA(ctx context.Context, name, namespace string) (*rsa.PrivateKey, *x5 // CreateCerts creates and returns a CA certificate and certificate and // key for the server. serverKey and serverCert are used by the server // to establish trust for clients, CA certificate is used by the -// client to verify the server authentication chain. -func CreateCerts(ctx context.Context, name, namespace string) (serverKey, serverCert, caCert []byte, err error) { +// client to verify the server authentication chain. notAfter specifies +// the expiration date. +func CreateCerts(ctx context.Context, name, namespace string, notAfter time.Time) (serverKey, serverCert, caCert []byte, err error) { logger := logging.FromContext(ctx) // First create a CA certificate and private key - caKey, caCertificate, caCertificatePEM, err := createCA(ctx, name, namespace) + caKey, caCertificate, caCertificatePEM, err := createCA(ctx, name, namespace, notAfter) if err != nil { return nil, nil, nil, err } @@ -146,7 +147,7 @@ func CreateCerts(ctx context.Context, name, namespace string) (serverKey, server logger.Errorw("error generating random key", zap.Error(err)) return nil, nil, nil, err } - servCertTemplate, err := createServerCertTemplate(name, namespace) + servCertTemplate, err := createServerCertTemplate(name, namespace, notAfter) if err != nil { logger.Errorw("failed to create the server certificate template", zap.Error(err)) return nil, nil, nil, err diff --git a/vendor/knative.dev/pkg/webhook/certificates/resources/secret.go b/vendor/knative.dev/pkg/webhook/certificates/resources/secret.go index 154ebcd6..48e57e87 100644 --- a/vendor/knative.dev/pkg/webhook/certificates/resources/secret.go +++ b/vendor/knative.dev/pkg/webhook/certificates/resources/secret.go @@ -18,6 +18,7 @@ package resources import ( "context" + "time" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -40,7 +41,7 @@ var MakeSecret = MakeSecretInternal // MakeSecretInternal is only public so MakeSecret can be restored in testing. Use MakeSecret. func MakeSecretInternal(ctx context.Context, name, namespace, serviceName string) (*corev1.Secret, error) { - serverKey, serverCert, caCert, err := CreateCerts(ctx, serviceName, namespace) + serverKey, serverCert, caCert, err := CreateCerts(ctx, serviceName, namespace, time.Now().AddDate(1, 0, 0)) if err != nil { return nil, err } diff --git a/vendor/knative.dev/pkg/webhook/testing/factory.go b/vendor/knative.dev/pkg/webhook/testing/factory.go index 800a8cec..26d35db3 100644 --- a/vendor/knative.dev/pkg/webhook/testing/factory.go +++ b/vendor/knative.dev/pkg/webhook/testing/factory.go @@ -51,7 +51,7 @@ type Ctor func(context.Context, *Listers, configmap.Watcher) controller.Reconcil // MakeFactory creates a reconciler factory with fake clients and controller created by `ctor`. func MakeFactory(ctor Ctor) rtesting.Factory { return func(t *testing.T, r *rtesting.TableRow) ( - controller.Reconciler, rtesting.ActionRecorderList, rtesting.EventList, *rtesting.FakeStatsReporter) { + controller.Reconciler, rtesting.ActionRecorderList, rtesting.EventList) { ls := NewListers(r.Objects) ctx := r.Ctx @@ -76,7 +76,6 @@ func MakeFactory(ctor Ctor) rtesting.Factory { eventRecorder := record.NewFakeRecorder(maxEventBufferSize) ctx = controller.WithEventRecorder(ctx, eventRecorder) - statsReporter := &rtesting.FakeStatsReporter{} // This is needed for the tests that use generated names and // the object cannot be created beforehand. @@ -109,7 +108,7 @@ func MakeFactory(ctor Ctor) rtesting.Factory { actionRecorderList := rtesting.ActionRecorderList{dynamicClient, kubeClient, apixClient} eventList := rtesting.EventList{Recorder: eventRecorder} - return c, actionRecorderList, eventList, statsReporter + return c, actionRecorderList, eventList } }