diff --git a/Gopkg.lock b/Gopkg.lock index 289043f3..6dddbbe1 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -966,7 +966,7 @@ [[projects]] branch = "master" - digest = "1:583ece64b8c1e09d59dbd6a94962f18c4c6a2cfe5d7c4f66584bc0f39af3efc9" + digest = "1:80c0e243552e01cdec518680967f72e6a435c4277b97b3ebf2e08f6590a389e7" name = "knative.dev/pkg" packages = [ "apis", @@ -986,18 +986,18 @@ "reconciler", ] pruneopts = "T" - revision = "f384223ab1b897e96e222e1b86370e1ebcba9ccd" + revision = "9147309d53665ac87d8a5a17dabdbe3e24c97d13" [[projects]] branch = "master" - digest = "1:50482e6fd500cf50c4a29d640cda026206145c6716dff72e4368a5e57fdb7095" + digest = "1:dc73d65f40ea05b1d0db96ae5491b6ebc162bb59b3ac5a252cdf87848bc7a4b7" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "9fa5882b65c5fe7e177bb74874e9a5ac87b84e98" + revision = "5e04d955cdb9a460b5d3f2a699bddcab22c8af94" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/OWNERS_ALIASES b/vendor/knative.dev/pkg/OWNERS_ALIASES index 8b64a318..029964e4 100644 --- a/vendor/knative.dev/pkg/OWNERS_ALIASES +++ b/vendor/knative.dev/pkg/OWNERS_ALIASES @@ -21,6 +21,7 @@ aliases: - mattmoor - mdemirhan - dprotaso + - vagababov controller-approvers: - dgerd diff --git a/vendor/knative.dev/pkg/logging/config b/vendor/knative.dev/pkg/logging/config new file mode 100644 index 00000000..2480fc6d --- /dev/null +++ b/vendor/knative.dev/pkg/logging/config @@ -0,0 +1,4 @@ +# The OWNERS file is used by prow to automatically merge approved PRs. + +approvers: +- configmap-approvers diff --git a/vendor/knative.dev/pkg/tracing/config/tracing.go b/vendor/knative.dev/pkg/tracing/config/tracing.go index f4e95436..eaa2bb6d 100644 --- a/vendor/knative.dev/pkg/tracing/config/tracing.go +++ b/vendor/knative.dev/pkg/tracing/config/tracing.go @@ -65,13 +65,17 @@ func (cfg *Config) Equals(other *Config) bool { return reflect.DeepEqual(other, cfg) } -// NewTracingConfigFromMap returns a Config given a map corresponding to a ConfigMap -func NewTracingConfigFromMap(cfgMap map[string]string) (*Config, error) { - tc := Config{ +func defaultConfig() *Config { + return &Config{ Backend: None, Debug: false, SampleRate: 0.1, } +} + +// NewTracingConfigFromMap returns a Config given a map corresponding to a ConfigMap +func NewTracingConfigFromMap(cfgMap map[string]string) (*Config, error) { + tc := defaultConfig() if backend, ok := cfgMap[backendKey]; ok { switch bt := BackendType(backend); bt { @@ -120,12 +124,15 @@ func NewTracingConfigFromMap(cfgMap map[string]string) (*Config, error) { if sampleRate, ok := cfgMap[sampleRateKey]; ok { sampleRateFloat, err := strconv.ParseFloat(sampleRate, 64) if err != nil { - return nil, fmt.Errorf("failed to parse sampleRate in tracing config: %v", err) + return nil, fmt.Errorf("failed to parse sampleRate in tracing config: %w", err) + } + if sampleRateFloat < 0 || sampleRateFloat > 1 { + return nil, fmt.Errorf("sampleRate = %v must be in [0, 1] range", sampleRateFloat) } tc.SampleRate = sampleRateFloat } - return &tc, nil + return tc, nil } // NewTracingConfigFromConfigMap returns a Config for the given configmap diff --git a/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh b/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh index c01adcb5..bdd74754 100755 --- a/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh +++ b/vendor/knative.dev/test-infra/scripts/presubmit-tests.sh @@ -129,7 +129,7 @@ function markdown_build_tests() { (( DISABLE_MD_LINTING && DISABLE_MD_LINK_CHECK )) && return 0 # Get changed markdown files (ignore /vendor, github templates, and deleted files) local mdfiles="" - for file in $(echo "${CHANGED_FILES}" | grep \.md$ | grep -v ^vendor/ | grep -v ^.github/); do + for file in $(echo "${CHANGED_FILES}" | grep \\.md$ | grep -v ^vendor/ | grep -v ^.github/); do [[ -f "${file}" ]] && mdfiles="${mdfiles} ${file}" done [[ -z "${mdfiles}" ]] && return 0