Skip to content
This repository has been archived by the owner on Jun 19, 2022. It is now read-only.

Commit

Permalink
Auto-update dependencies (#646)
Browse files Browse the repository at this point in the history
Produced via:
  `./hack/update-deps.sh --upgrade && ./hack/update-codegen.sh`
/assign grantr nachocano
/cc grantr nachocano
  • Loading branch information
mattmoor authored Mar 13, 2020
1 parent 485e32b commit 94506c2
Show file tree
Hide file tree
Showing 14 changed files with 206 additions and 14 deletions.
14 changes: 8 additions & 6 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
Copyright 2020 The Knative Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package fake

import (
context "context"

controller "knative.dev/pkg/controller"
injection "knative.dev/pkg/injection"
secret "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"
fake "knative.dev/pkg/injection/clients/namespacedkube/informers/factory/fake"
)

var Get = secret.Get

func init() {
injection.Fake.RegisterInformer(withInformer)
}

func withInformer(ctx context.Context) (context.Context, controller.Informer) {
f := fake.Get(ctx)
inf := f.Core().V1().Secrets()
return context.WithValue(ctx, secret.Key{}, inf), inf.Informer()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
Copyright 2020 The Knative Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package secret

import (
context "context"

v1 "k8s.io/client-go/informers/core/v1"
controller "knative.dev/pkg/controller"
injection "knative.dev/pkg/injection"
factory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory"
logging "knative.dev/pkg/logging"
)

func init() {
injection.Default.RegisterInformer(withInformer)
}

// Key is used for associating the Informer inside the context.Context.
type Key struct{}

func withInformer(ctx context.Context) (context.Context, controller.Informer) {
f := factory.Get(ctx)
inf := f.Core().V1().Secrets()
return context.WithValue(ctx, Key{}, inf), inf.Informer()
}

// Get extracts the typed informer from the context.
func Get(ctx context.Context) v1.SecretInformer {
untyped := ctx.Value(Key{})
if untyped == nil {
logging.FromContext(ctx).Panic(
"Unable to fetch k8s.io/client-go/informers/core/v1.SecretInformer from context.")
}
return untyped.(v1.SecretInformer)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
Copyright 2020 The Knative Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package factory

import (
context "context"

informers "k8s.io/client-go/informers"
client "knative.dev/pkg/client/injection/kube/client"
controller "knative.dev/pkg/controller"
injection "knative.dev/pkg/injection"
logging "knative.dev/pkg/logging"
"knative.dev/pkg/system"
)

func init() {
injection.Default.RegisterInformerFactory(withInformerFactory)
}

// Key is used as the key for associating information with a context.Context.
type Key struct{}

func withInformerFactory(ctx context.Context) context.Context {
c := client.Get(ctx)
return context.WithValue(ctx, Key{},
informers.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx),
// This factory scopes things to the system namespace.
informers.WithNamespace(system.Namespace())))
}

// Get extracts the InformerFactory from the context.
func Get(ctx context.Context) informers.SharedInformerFactory {
untyped := ctx.Value(Key{})
if untyped == nil {
logging.FromContext(ctx).Panic(
"Unable to fetch k8s.io/client-go/informers.SharedInformerFactory from context.")
}
return untyped.(informers.SharedInformerFactory)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
Copyright 2020 The Knative Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package fake

import (
context "context"

informers "k8s.io/client-go/informers"
fake "knative.dev/pkg/client/injection/kube/client/fake"
controller "knative.dev/pkg/controller"
injection "knative.dev/pkg/injection"
factory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory"
"knative.dev/pkg/system"
)

var Get = factory.Get

func init() {
injection.Fake.RegisterInformerFactory(withInformerFactory)
}

func withInformerFactory(ctx context.Context) context.Context {
c := fake.Get(ctx)
return context.WithValue(ctx, factory.Key{},
informers.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx),
// This factory scopes things to the system namespace.
informers.WithNamespace(system.Namespace())))
}
2 changes: 1 addition & 1 deletion vendor/knative.dev/pkg/webhook/certificates/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

// Injection stuff
kubeclient "knative.dev/pkg/client/injection/kube/client"
secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"

"k8s.io/client-go/tools/cache"
"knative.dev/pkg/configmap"
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/pkg/webhook/configmaps/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
// Injection stuff
kubeclient "knative.dev/pkg/client/injection/kube/client"
vwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration"
secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"

"k8s.io/client-go/tools/cache"
"knative.dev/pkg/configmap"
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/pkg/webhook/psbinding/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
// Injection stuff
kubeclient "knative.dev/pkg/client/injection/kube/client"
mwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration"
secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"

"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/cache"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"knative.dev/pkg/apis"
apixclient "knative.dev/pkg/client/injection/apiextensions/client"
crdinformer "knative.dev/pkg/client/injection/apiextensions/informers/apiextensions/v1beta1/customresourcedefinition"
secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
"knative.dev/pkg/controller"
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"
"knative.dev/pkg/logging"
"knative.dev/pkg/system"
"knative.dev/pkg/webhook"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
// Injection stuff
kubeclient "knative.dev/pkg/client/injection/kube/client"
mwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration"
secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"

"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/tools/cache"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
// Injection stuff
kubeclient "knative.dev/pkg/client/injection/kube/client"
vwhinformer "knative.dev/pkg/client/injection/kube/informers/admissionregistration/v1beta1/validatingwebhookconfiguration"
secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
secretinformer "knative.dev/pkg/injection/clients/namespacedkube/informers/core/v1/secret"

"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/tools/cache"
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/pkg/webhook/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

// Injection stuff
kubeclient "knative.dev/pkg/client/injection/kube/client"
kubeinformerfactory "knative.dev/pkg/client/injection/kube/informers/factory"
kubeinformerfactory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory"

"go.uber.org/zap"
"golang.org/x/sync/errgroup"
Expand Down
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/third_party/istio-1.5-latest
8 changes: 7 additions & 1 deletion vendor/knative.dev/test-infra/scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,13 @@ function main() {
if [[ -n "${RELEASE_BRANCH}" && -z "${FROM_NIGHTLY_RELEASE}" && "${current_branch}" != "${RELEASE_BRANCH}" ]]; then
setup_upstream
setup_branch
git checkout upstream/"${RELEASE_BRANCH}" || abort "cannot checkout branch ${RELEASE_BRANCH}"
# When it runs in Prow, the origin is identical with upstream, and previous
# fetch already fetched release-* branches, so no need to `checkout -b`
if (( IS_PROW )); then
git checkout "${RELEASE_BRANCH}" || abort "cannot checkout branch ${RELEASE_BRANCH}"
else
git checkout -b "${RELEASE_BRANCH}" upstream/"${RELEASE_BRANCH}" || abort "cannot checkout branch ${RELEASE_BRANCH}"
fi
# HACK HACK HACK
# Rerun the release script from the release branch. Fixes https://github.com/knative/test-infra/issues/1262
./hack/release.sh "$@"
Expand Down

0 comments on commit 94506c2

Please sign in to comment.