[master] Auto-update dependencies (#240)

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-01 07:11:18 -07:00 committed by GitHub
parent f9a94908b8
commit 4a8e88e295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 31 deletions

8
Gopkg.lock generated
View File

@ -966,7 +966,7 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:18f4c5453f19fef868e3da19f815840517c4bfa28e15fb2cccd504a9b96ce68d" digest = "1:1cfbe38d639ea8c4aeb9f1b0b98ac80b0004ef612f0b48eb572ba6bb23bdc003"
name = "knative.dev/pkg" name = "knative.dev/pkg"
packages = [ packages = [
"apis", "apis",
@ -986,18 +986,18 @@
"reconciler", "reconciler",
] ]
pruneopts = "T" pruneopts = "T"
revision = "e2ee5bed78d74604ed87dcb761a6f6e10a2e355c" revision = "94b2b6aaaf4b81c3b26b269bd477518094aa31a5"
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:41da78d06d64a1eb47a1d3f8209d33af386fa8f22d1b04b25825ae5cd187be1d" digest = "1:5da0f15efcd7dafa6296be9cd4a630fcb5253cf202e54638299221ae7df419ab"
name = "knative.dev/test-infra" name = "knative.dev/test-infra"
packages = [ packages = [
"scripts", "scripts",
"tools/dep-collector", "tools/dep-collector",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "030e4e29cb8ba9502a06b667b1450f6a725371b1" revision = "5bdfbd623938f0cc4a260bf06c503bbb0a76d6f9"
[[projects]] [[projects]]
digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c"

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

@ -1362,14 +1362,14 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:2987a1db00b983af9e5d5281639a754fb6449eef01e6a375894829eaec17cb2a" digest = "1:41da78d06d64a1eb47a1d3f8209d33af386fa8f22d1b04b25825ae5cd187be1d"
name = "knative.dev/test-infra" name = "knative.dev/test-infra"
packages = [ packages = [
"scripts", "scripts",
"tools/dep-collector", "tools/dep-collector",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "9a501343b4dafbac1a1a5dcfe2cb46975a78abb5" revision = "030e4e29cb8ba9502a06b667b1450f6a725371b1"
[[projects]] [[projects]]
digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c"

View File

@ -37,32 +37,35 @@ var (
// NewConfigFromMap returns a Config for the given map, or an error. // NewConfigFromMap returns a Config for the given map, or an error.
func NewConfigFromMap(data map[string]string) (*Config, error) { func NewConfigFromMap(data map[string]string) (*Config, error) {
config := &Config{ config := defaultConfig()
EnabledComponents: sets.NewString(),
}
if resourceLock := data["resourceLock"]; !validResourceLocks.Has(resourceLock) { if resourceLock, ok := data["resourceLock"]; ok {
return nil, fmt.Errorf(`resourceLock: invalid value %q: valid values are "leases","configmaps","endpoints"`, resourceLock) if !validResourceLocks.Has(resourceLock) {
} else { return nil, fmt.Errorf(`resourceLock: invalid value %q: valid values are "leases","configmaps","endpoints"`, resourceLock)
}
config.ResourceLock = resourceLock config.ResourceLock = resourceLock
} }
if leaseDuration, err := time.ParseDuration(data["leaseDuration"]); err != nil { for _, d := range []struct {
return nil, fmt.Errorf("leaseDuration: invalid duration: %q", data["leaseDuration"]) key string
} else { val *time.Duration
config.LeaseDuration = leaseDuration }{{
} "leaseDuration",
&config.LeaseDuration,
if renewDeadline, err := time.ParseDuration(data["renewDeadline"]); err != nil { }, {
return nil, fmt.Errorf("renewDeadline: invalid duration: %q", data["renewDeadline"]) "renewDeadline",
} else { &config.RenewDeadline,
config.RenewDeadline = renewDeadline }, {
} "retryPeriod",
&config.RetryPeriod,
if retryPeriod, err := time.ParseDuration(data["retryPeriod"]); err != nil { }} {
return nil, fmt.Errorf("retryPeriod: invalid duration: %q", data["retryPeriod"]) if v, ok := data[d.key]; ok {
} else { dur, err := time.ParseDuration(v)
config.RetryPeriod = retryPeriod if err != nil {
return nil, fmt.Errorf("%s: invalid duration: %q", d.key, v)
}
*d.val = dur
}
} }
// enabledComponents are not validated here, because they are dependent on // enabledComponents are not validated here, because they are dependent on
@ -82,7 +85,6 @@ func NewConfigFromConfigMap(configMap *corev1.ConfigMap) (*Config, error) {
config := defaultConfig() config := defaultConfig()
return config, nil return config, nil
} }
return NewConfigFromMap(configMap.Data) return NewConfigFromMap(configMap.Data)
} }
@ -154,5 +156,5 @@ func UniqueID() (string, error) {
return "", err return "", err
} }
return (id + "_" + string(uuid.NewUUID())), nil return id + "_" + string(uuid.NewUUID()), nil
} }

View File

@ -93,7 +93,7 @@ function dump_cluster_state() {
echo "*** Start of information dump ***" echo "*** Start of information dump ***"
echo "***************************************" echo "***************************************"
local output="${ARTIFACTS}/k8s.dump.txt" local output="${ARTIFACTS}/k8s.dump-$(basename ${E2E_SCRIPT}).txt"
echo ">>> The dump is located at ${output}" echo ">>> The dump is located at ${output}"
for crd in $(kubectl api-resources --verbs=list -o name | sort); do for crd in $(kubectl api-resources --verbs=list -o name | sort); do