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

Commit

Permalink
[master] Auto-update dependencies (#1187)
Browse files Browse the repository at this point in the history
Produced via:
  `./hack/update-deps.sh --upgrade && ./hack/update-codegen.sh`
/assign grantr ian-mi nachocano
/cc grantr ian-mi nachocano
  • Loading branch information
mattmoor authored Jun 2, 2020
1 parent f016967 commit 848d632
Show file tree
Hide file tree
Showing 23 changed files with 416 additions and 220 deletions.
7 changes: 4 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ require (
k8s.io/api v0.17.6
k8s.io/apimachinery v0.18.1
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
knative.dev/eventing v0.15.1-0.20200529211210-a70e7c4a28f3
knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82
knative.dev/serving v0.15.1-0.20200527151759-5b8ff09ace4f
knative.dev/eventing v0.15.1-0.20200602132917-9119a2e34905
knative.dev/pkg v0.0.0-20200601184204-18c577c87d4f
knative.dev/serving v0.15.1-0.20200602105317-468ae278d9e3
knative.dev/test-infra v0.0.0-20200602024303-e406de9f65c4 // indirect
sigs.k8s.io/yaml v1.2.0
)

Expand Down
25 changes: 13 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkg
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emicklei/go-restful-swagger12 v0.0.0-20170208215640-dcef7f557305/go.mod h1:qr0VowGBT4CS4Q8vFF8BSeKz34PuqKGxs/L0IAQA9DQ=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
Expand Down Expand Up @@ -714,7 +713,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLD
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Expand Down Expand Up @@ -1487,6 +1485,7 @@ k8s.io/kubernetes v1.14.7/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
k8s.io/legacy-cloud-providers v0.17.0/go.mod h1:DdzaepJ3RtRy+e5YhNtrCYwlgyK87j/5+Yfp0L9Syp8=
k8s.io/legacy-cloud-providers v0.17.4/go.mod h1:FikRNoD64ECjkxO36gkDgJeiQWwyZTuBkhu+yxOc1Js=
k8s.io/metrics v0.17.2/go.mod h1:3TkNHET4ROd+NfzNxkjoVfQ0Ob4iZnaHmSEA4vYpwLw=
k8s.io/metrics v0.17.6/go.mod h1:5AuIG+m+U5ga8DpqAUqQWBhGVyY485HfKpn471pmWrQ=
k8s.io/test-infra v0.0.0-20181019233642-2e10a0bbe9b3/go.mod h1:2NzXB13Ji0nqpyublHeiPC4FZwU0TknfvyaaNfl/BTA=
k8s.io/test-infra v0.0.0-20191212060232-70b0b49fe247/go.mod h1:d8SKryJBXAwfCFVL4wieRez47J2NOOAb9d029sWLseQ=
k8s.io/test-infra v0.0.0-20200407001919-bc7f71ef65b8/go.mod h1:/WpJWcaDvuykB322WXP4kJbX8IpalOzuPxA62GpwkJk=
Expand All @@ -1501,8 +1500,8 @@ k8s.io/utils v0.0.0-20200124190032-861946025e34 h1:HjlUD6M0K3P8nRXmr2B9o4F9dUy9T
k8s.io/utils v0.0.0-20200124190032-861946025e34/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
knative.dev/caching v0.0.0-20190719140829-2032732871ff/go.mod h1:dHXFU6CGlLlbzaWc32g80cR92iuBSpsslDNBWI8C7eg=
knative.dev/caching v0.0.0-20200521155757-e78d17bc250e/go.mod h1:bsKPIG2XZFYL8uw5BAxg7EMBLp0vNpu9jZIGus8HUPU=
knative.dev/eventing v0.15.1-0.20200529211210-a70e7c4a28f3 h1:M+Wi41f0sKiiJ83MeYY54UaSClA2WfopBmV2nOCGKzc=
knative.dev/eventing v0.15.1-0.20200529211210-a70e7c4a28f3/go.mod h1:sHgMoXa+Hs9fqjQRy7Nqi7eq6FDlFZ1CKe96/Mg0aCE=
knative.dev/eventing v0.15.1-0.20200602132917-9119a2e34905 h1:MtC6whrxg5MOApJLrjE9PMNDHE98OmOSE57SGu9h3Y8=
knative.dev/eventing v0.15.1-0.20200602132917-9119a2e34905/go.mod h1:Rp3KyUnVKLsrKwdf6R86b73C7qIdssGV/AOOUvQUMCA=
knative.dev/eventing-contrib v0.6.1-0.20190723221543-5ce18048c08b/go.mod h1:SnXZgSGgMSMLNFTwTnpaOH7hXDzTFtw0J8OmHflNx3g=
knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11 h1:w+AcPuGp389HAI5FDW9L0j7MQbxnU1RtZfLP7BMgNDI=
knative.dev/pkg v0.0.0-20191101194912-56c2594e4f11/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
Expand All @@ -1514,13 +1513,14 @@ knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV
knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7 h1:9S2r59HZJF9nKvoRLg5zJzx6XpVlVyvVRqz/C/h6h2s=
knative.dev/pkg v0.0.0-20200519155757-14eb3ae3a5a7/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA=
knative.dev/pkg v0.0.0-20200520073958-94316e20e860/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA=
knative.dev/pkg v0.0.0-20200526194649-c48d2ebdae96/go.mod h1:4ipprwHqpqiyYHbrEjSf1kNwL+sJOqHhj1ujO2WxvpE=
knative.dev/pkg v0.0.0-20200527024749-495174c96651 h1:/LhCktTMhJrCDXGg3KCWeSQTLLGy3Ms4AaqM9O/05dI=
knative.dev/pkg v0.0.0-20200527024749-495174c96651/go.mod h1:4ipprwHqpqiyYHbrEjSf1kNwL+sJOqHhj1ujO2WxvpE=
knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82 h1:uC65bOUmC5UsVJgUI28QWis/oiqnZrU49wLM828ioJM=
knative.dev/pkg v0.0.0-20200527173759-2d1a04d1ff82/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM=
knative.dev/serving v0.15.1-0.20200527151759-5b8ff09ace4f h1:v10RN+CYS9Q+fZ/EBXkVDTK9VCQ1rTL8aqa80m6tUXE=
knative.dev/serving v0.15.1-0.20200527151759-5b8ff09ace4f/go.mod h1:Qv35BrBQ5NYXzwdi+gK4fIZu+Y2S+kxXOG8UfW0T8UE=
knative.dev/pkg v0.0.0-20200528190300-08a86da47d28/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM=
knative.dev/pkg v0.0.0-20200529164702-389d28f9b67a/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM=
knative.dev/pkg v0.0.0-20200601184204-18c577c87d4f h1:xVWLh9bMhQiFgU1ommpDLW5djc5fPOwi6ulnCt80CO0=
knative.dev/pkg v0.0.0-20200601184204-18c577c87d4f/go.mod h1:ywZfX/0D8hoOf4uJVgeEvJpSmsOauQvr1IuAWld9UjM=
knative.dev/serving v0.15.1-0.20200602105317-468ae278d9e3 h1:CxSJURHDcTDDdnBHnYGxHuR3HLdruqfdrCQuybfV7cE=
knative.dev/serving v0.15.1-0.20200602105317-468ae278d9e3/go.mod h1:ebxxoSXTWJjCBdyb3P6KU0kNuVEAUMi22OI2E7mAxxY=
knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU=
knative.dev/test-infra v0.0.0-20200513011557-d03429a76034 h1:JxqONCZVS7or+Fv3ebVQoipuIBH7Ig3Qbx170hgIF+A=
Expand All @@ -1530,9 +1530,10 @@ knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT
knative.dev/test-infra v0.0.0-20200519161858-554a95a37986 h1:ZDy43jkWPQ75d4l4DGy+ENQIXlNcnHIh4tB6XxgovNc=
knative.dev/test-infra v0.0.0-20200519161858-554a95a37986/go.mod h1:LeNa1Wvn47efeQUkpkn3XG7Fx9Ga+rhAP13SZyjaEGg=
knative.dev/test-infra v0.0.0-20200522180958-6a0a9b9d893a/go.mod h1:n9eQkzmSNj8BiqNFl1lzoz68D09uMeJfyOjc132Gbik=
knative.dev/test-infra v0.0.0-20200526171149-39b911556285/go.mod h1:n9eQkzmSNj8BiqNFl1lzoz68D09uMeJfyOjc132Gbik=
knative.dev/test-infra v0.0.0-20200527185659-fc87694eb879 h1:3spi67ya78+ofPZLHpJkZlBSj6pBowXa8/1Zdha6MCY=
knative.dev/test-infra v0.0.0-20200527185659-fc87694eb879/go.mod h1:7JtOmoYiYxh2oFO23nwGanuJ6qT6mFrRlZV1LL6gomY=
knative.dev/test-infra v0.0.0-20200528222301-350178ab2a0e/go.mod h1:7JtOmoYiYxh2oFO23nwGanuJ6qT6mFrRlZV1LL6gomY=
knative.dev/test-infra v0.0.0-20200531185603-9c9dad87b366/go.mod h1:c02XF+uTFJ4WfBKjSlT3XCAv14hXVTZxLjMDA7lH63E=
knative.dev/test-infra v0.0.0-20200602024303-e406de9f65c4 h1:1l1kPOYdCd6d++wskVD32h5Bt56X1tpFKQF3FGkcu6w=
knative.dev/test-infra v0.0.0-20200602024303-e406de9f65c4/go.mod h1:JV4E61erdHLn4jT0X+svUP7lZYggJyXMCGDewTSQuO8=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

// +genclient
// +genreconciler:class=eventing.knative.dev/broker.class
// +genreconciler:class=eventing.knative.dev/broker.class,krshapedlogic=true
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

// Broker collects a pool of events that are consumable using Triggers. Brokers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
)

// +genclient
// +genreconciler
// +genreconciler:krshapedlogic=true
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

type EventType struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const (
)

// +genclient
// +genreconciler
// +genreconciler:krshapedlogic=true
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

// Trigger represents a request to have events delivered to a consumer from a
Expand Down
2 changes: 1 addition & 1 deletion vendor/knative.dev/pkg/apis/duck/v1/status_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (source *Status) ConvertTo(ctx context.Context, sink *Status, predicates ..
sink.ObservedGeneration = source.ObservedGeneration
if source.Annotations != nil {
// This will deep copy the map.
sink.Annotations = kmeta.UnionMaps(source.Annotations, nil)
sink.Annotations = kmeta.UnionMaps(source.Annotations)
}

conditions := make(apis.Conditions, 0, len(source.Conditions))
Expand Down
3 changes: 2 additions & 1 deletion vendor/knative.dev/pkg/apis/duck/v1beta1/status_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ func (s *Status) GetCondition(t apis.ConditionType) *apis.Condition {
func (source *Status) ConvertTo(ctx context.Context, sink *Status) {
sink.ObservedGeneration = source.ObservedGeneration
if source.Annotations != nil {
sink.Annotations = kmeta.UnionMaps(source.Annotations, nil)
// This will deep copy the map.
sink.Annotations = kmeta.UnionMaps(source.Annotations)
}
for _, c := range source.Conditions {
switch c.Type {
Expand Down
16 changes: 16 additions & 0 deletions vendor/knative.dev/pkg/configmap/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"strings"
"time"

"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/sets"
)

Expand Down Expand Up @@ -114,6 +115,21 @@ func AsStringSet(key string, target *sets.String) ParseFunc {
}
}

// AsQuantity parses the value at key as a *resource.Quantity into the target, if it exists
func AsQuantity(key string, target **resource.Quantity) ParseFunc {
return func(data map[string]string) error {
if raw, ok := data[key]; ok {
val, err := resource.ParseQuantity(raw)
if err != nil {
return fmt.Errorf("failed to parse %q: %w", key, err)
}

*target = &val
}
return nil
}
}

// Parse parses the given map using the parser functions passed in.
func Parse(data map[string]string, parsers ...ParseFunc) error {
for _, parse := range parsers {
Expand Down
11 changes: 7 additions & 4 deletions vendor/knative.dev/pkg/metrics/stackdriver_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,13 @@ func init() {

func newOpencensusSDExporter(o stackdriver.Options) (view.Exporter, error) {
e, err := stackdriver.NewExporter(o)
if err == nil {
// Start the exporter.
// TODO(https://github.com/knative/pkg/issues/866): Move this to an interface.
e.StartMetricsExporter()
if err != nil {
return nil, err
}
// Start the exporter.
// TODO(https://github.com/knative/pkg/issues/866): Move this to an interface.
if err := e.StartMetricsExporter(); err != nil {
return nil, err
}
return e, nil
}
Expand Down
51 changes: 51 additions & 0 deletions vendor/knative.dev/pkg/test/gcs/client.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
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 gcs

import (
"context"

"cloud.google.com/go/storage"
)

type Client interface {
// NewStorageBucket creates a new bucket in GCS with uniform access policy
NewStorageBucket(ctx context.Context, bkt, project string) error
// DeleteStorageBucket removes all children objects, force if not empty
DeleteStorageBucket(ctx context.Context, bkt string, force bool) error
// Exists check if an object exists under a bucket, assuming bucket exists
Exists(ctx context.Context, bkt, objPath string) bool
// ListChildrenFiles recursively lists all children files
ListChildrenFiles(ctx context.Context, bkt, dirPath string) ([]string, error)
// ListDirectChildren lists direct children paths (incl. files and dir)
ListDirectChildren(ctx context.Context, bkt, dirPath string) ([]string, error)
// AttrObject returns the object attributes
AttrObject(ctx context.Context, bkt, objPath string) (*storage.ObjectAttrs, error)
// CopyObject copies objects from one location to another, assuming both src and dst
// buckets both exist
CopyObject(ctx context.Context, srcBkt, srcObjPath, dstBkt, dstObjPath string) error
// ReadObject reads a GCS object and returns then contents in []byte
ReadObject(ctx context.Context, bkt, objPath string) ([]byte, error)
// WriteObject writes []byte content to a GCS object
WriteObject(ctx context.Context, bkt, objPath string, content []byte) (int, error)
// DeleteObject deletes an object
DeleteObject(ctx context.Context, bkt, objPath string) error
// Download downloads GCS object to a local file, assuming bucket exists
Download(ctx context.Context, bktName, objPath, filePath string) error
// Upload uploads a local file to a GCS object, assuming bucket exists
Upload(ctx context.Context, bktName, objPath, filePath string) error
}
Loading

0 comments on commit 848d632

Please sign in to comment.