[master] Auto-update dependencies (#256)

Produced via:
  `./hack/update-deps.sh --upgrade && ./hack/update-codegen.sh`
/assign n3wscott vagababov
/cc n3wscott vagababov
This commit is contained in:
Matt Moore 2020-04-24 10:27:50 -07:00 committed by GitHub
parent fcbfad7ffa
commit c8036952a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 23 deletions

8
Gopkg.lock generated
View File

@ -966,7 +966,7 @@
[[projects]]
branch = "master"
digest = "1:13985b1557d4a99d1d635aa0559e03ae970cda1601c957464fe757c1c9542caa"
digest = "1:bcff22fa5a7779335e4812c47866681e266cdd83a10356b6e967eefac4563de1"
name = "knative.dev/pkg"
packages = [
"apis",
@ -986,18 +986,18 @@
"reconciler",
]
pruneopts = "T"
revision = "6103dd9b71311a75982dc89bf682ee852673d70e"
revision = "4945766b290cbd486c9e3fdaded78985875e516b"
[[projects]]
branch = "master"
digest = "1:8a965ebe2d83033f6a07e926357f7341b6c7f42e165a3e13c7c8113b953a265b"
digest = "1:dc9ba2b25034dbe099b604ce1e243b42502d4ea7b096f844abd1f1617e1151ac"
name = "knative.dev/test-infra"
packages = [
"scripts",
"tools/dep-collector",
]
pruneopts = "UT"
revision = "1be83cfc7702b712d4dcec6209105b012e930308"
revision = "f645de8d9a500a3fd00149f1b4e693029d678132"
[[projects]]
digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c"

8
vendor/knative.dev/pkg/Gopkg.lock generated vendored
View File

@ -165,12 +165,12 @@
version = "v0.1.1"
[[projects]]
digest = "1:53151cc4366e3945282d4b783fd41f35222cabbc75601e68d8133648c63498d1"
digest = "1:416b666cb79f02526f115d16aba8b318b854f3c964107081311e9df6a08b39a9"
name = "github.com/gobuffalo/envy"
packages = ["."]
pruneopts = "NUT"
revision = "043cb4b8af871b49563291e32c66bb84378a60ac"
version = "v1.7.0"
revision = "3dbe4c98c1c77e4a8fac053251c262a85e048f21"
version = "v1.9.0"
[[projects]]
digest = "1:2b0e6c0bea11257c646616ebd6a62be0ef2b6a0fd8210ac3caeaf57ee136123b"
@ -1376,7 +1376,7 @@
"tools/dep-collector",
]
pruneopts = "UT"
revision = "891d25bbf859bfc829b515068cc3e167a7fcc528"
revision = "1be83cfc7702b712d4dcec6209105b012e930308"
[[projects]]
digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c"

View File

@ -96,16 +96,20 @@ func NewReconciler(ctx context.Context, logger *zap.SugaredLogger, client client
}
rec := &reconcilerImpl{
Client: client,
Lister: lister,
Recorder: recorder,
reconciler: r,
Client: client,
Lister: lister,
Recorder: recorder,
reconciler: r,
finalizerName: defaultFinalizerName,
}
for _, opts := range options {
if opts.ConfigStore != nil {
rec.configStore = opts.ConfigStore
}
if opts.FinalizerName != "" {
rec.finalizerName = opts.FinalizerName
}
}
return rec

View File

@ -95,16 +95,20 @@ func NewReconciler(ctx context.Context, logger *zap.SugaredLogger, client kubern
}
rec := &reconcilerImpl{
Client: client,
Lister: lister,
Recorder: recorder,
reconciler: r,
Client: client,
Lister: lister,
Recorder: recorder,
reconciler: r,
finalizerName: defaultFinalizerName,
}
for _, opts := range options {
if opts.ConfigStore != nil {
rec.configStore = opts.ConfigStore
}
if opts.FinalizerName != "" {
rec.finalizerName = opts.FinalizerName
}
}
return rec

View File

@ -225,6 +225,7 @@ func NewReconciler(ctx {{.contextContext|raw}}, logger *{{.zapSugaredLogger|raw}
Lister: lister,
Recorder: recorder,
reconciler: r,
finalizerName: defaultFinalizerName,
{{if .hasClass}}classValue: classValue,{{end}}
}
@ -232,6 +233,9 @@ func NewReconciler(ctx {{.contextContext|raw}}, logger *{{.zapSugaredLogger|raw}
if opts.ConfigStore != nil {
rec.configStore = opts.ConfigStore
}
if opts.FinalizerName != "" {
rec.finalizerName = opts.FinalizerName
}
}
return rec
@ -333,11 +337,11 @@ func (r *reconcilerImpl) Reconcile(ctx {{.contextContext|raw}}, key string) erro
if reconcileEvent != nil {
var event *{{.reconcilerReconcilerEvent|raw}}
if reconciler.EventAs(reconcileEvent, &event) {
logger.Infow("returned an event", zap.Any("event", reconcileEvent))
logger.Infow("Returned an event", zap.Any("event", reconcileEvent))
r.Recorder.Eventf(resource, event.EventType, event.Reason, event.Format, event.Args...)
return nil
} else {
logger.Errorw("returned an error", zap.Error(reconcileEvent))
logger.Errorw("Returned an error", zap.Error(reconcileEvent))
r.Recorder.Event(resource, {{.corev1EventTypeWarning|raw}}, "InternalError", reconcileEvent.Error())
return reconcileEvent
}

View File

@ -90,8 +90,14 @@ func admissionHandler(rootLogger *zap.SugaredLogger, stats StatsReporter, c Admi
var response admissionv1beta1.AdmissionReview
reviewResponse := c.Admit(ctx, review.Request)
logger.Infof("AdmissionReview for %#v: %s/%s response=%#v",
review.Request.Kind, review.Request.Namespace, review.Request.Name, reviewResponse)
var patchType string
if reviewResponse.PatchType != nil {
patchType = string(*reviewResponse.PatchType)
}
logger.Infof("AdmissionReview for %#v: %s/%s response={ UID: %#v, Allowed: %t, Status: %#v, Patch: %s, PatchType: %s, AuditAnnotations: %#v}",
review.Request.Kind, review.Request.Namespace, review.Request.Name,
reviewResponse.UID, reviewResponse.Allowed, reviewResponse.Result, string(reviewResponse.Patch), patchType, reviewResponse.AuditAnnotations)
if !reviewResponse.Allowed || reviewResponse.PatchType != nil || response.Response == nil {
response.Response = reviewResponse

View File

@ -489,11 +489,11 @@ function run_go_tool() {
local install_failed=0
# Swallow the output as we are returning the stdout in the end.
pushd "${temp_dir}" > /dev/null 2>&1
go ${action} $1 || install_failed=1
GOFLAGS="" go ${action} $1 || install_failed=1
popd > /dev/null 2>&1
(( install_failed )) && return ${install_failed}
else
go ${action} $1
GOFLAGS="" go ${action} $1
fi
fi
shift 2
@ -515,7 +515,7 @@ function update_licenses() {
function check_licenses() {
# Fetch the google/licenseclassifier for its license db
rm -fr ${GOPATH}/src/github.com/google/licenseclassifier
go get -u github.com/google/licenseclassifier
GOFLAGS="" go get -u github.com/google/licenseclassifier
# Check that we don't have any forbidden licenses in our images.
run_go_tool knative.dev/test-infra/tools/dep-collector dep-collector -check $@
}