From b39f65954da32941b194105a14b112916213b4a1 Mon Sep 17 00:00:00 2001 From: "Preparing for v0.13 release, point pkg to release-0.13." Date: Wed, 26 Feb 2020 15:05:23 +0000 Subject: [PATCH] Preparing for v0.13 release, point pkg to release-0.13. ## Proposed Changes - Prepping for `v0.13` release. - Point `knative.dev/pkg` to branch `release-0.13`. **Release Note** ```release-note NONE ``` /cc @mattmoor --- Gopkg.lock | 10 ++-- Gopkg.toml | 2 +- vendor/knative.dev/pkg/Gopkg.lock | 5 +- .../pkg/injection/sharedmain/main.go | 19 +------ vendor/knative.dev/pkg/kmeta/map.go | 54 ------------------- vendor/knative.dev/pkg/metrics/README.md | 4 +- vendor/knative.dev/pkg/metrics/config.go | 8 --- vendor/knative.dev/pkg/metrics/exporter.go | 16 ------ .../pkg/metrics/opencensus_exporter.go | 42 +-------------- .../pkg/metrics/testdata/README.md | 14 ----- .../pkg/metrics/testdata/client-cert.pem | 16 ------ .../pkg/metrics/testdata/client-key.pem | 9 ---- .../pkg/metrics/testdata/server-cert.pem | 17 ------ .../pkg/metrics/testdata/server-key.pem | 28 ---------- .../knative.dev/pkg/test/logging/logging.go | 10 +--- 15 files changed, 14 insertions(+), 240 deletions(-) delete mode 100644 vendor/knative.dev/pkg/kmeta/map.go delete mode 100644 vendor/knative.dev/pkg/metrics/testdata/README.md delete mode 100644 vendor/knative.dev/pkg/metrics/testdata/client-cert.pem delete mode 100644 vendor/knative.dev/pkg/metrics/testdata/client-key.pem delete mode 100644 vendor/knative.dev/pkg/metrics/testdata/server-cert.pem delete mode 100644 vendor/knative.dev/pkg/metrics/testdata/server-key.pem diff --git a/Gopkg.lock b/Gopkg.lock index 3ca17f7112..e3af86efff 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1934,11 +1934,11 @@ "test/test_images/transformevents", ] pruneopts = "UT" - revision = "39829071d79dab64f5e742bdfbdfc3004bcf2da2" + revision = "337d020e029811764b947fb89d10761839a1606a" [[projects]] - branch = "master" - digest = "1:82eaafe1b10a648afe37de603c6d9f4fe69fb5c129ecc832a5997335f3a0ee89" + branch = "release-0.13" + digest = "1:f8d227da9c1b062805ff9b98c500f19f02c9015d7bcd3134bfac26829df537fb" name = "knative.dev/pkg" packages = [ "apis", @@ -2010,7 +2010,7 @@ "webhook/resourcesemantics/validation", ] pruneopts = "T" - revision = "7af3fab62ce2bf2f861fee510eeb15eccb47925e" + revision = "1033748a7ec0f07204774c163436291841855779" [[projects]] branch = "master" @@ -2053,7 +2053,7 @@ "pkg/client/listers/serving/v1beta1", ] pruneopts = "NUT" - revision = "744090c517077e65c6d806357532d96507a6b0b9" + revision = "ca5f921b9429b8e79caad6a0b6f540dda95ff4d2" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index 4a510eda7e..0e056a0802 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -53,7 +53,7 @@ required = [ [[override]] name = "knative.dev/pkg" - branch = "master" + branch = "release-0.13" [[constraint]] name = "github.com/go-kivik/kivik" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index 8ec3cc89c4..1a008c57dd 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1339,14 +1339,14 @@ [[projects]] branch = "master" - digest = "1:e7ea104eff9c91ce48f1730ab8b4098faa1ea519162ccbbbca68c205428f0e21" + digest = "1:691951c6805590983ccea7c6dbca360bcb58af5f4d60f75af9499903bb3039e9" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "908ad6cdb8e4aab96cdf0d94f766db7caf4fe129" + revision = "279d938f5e19db2550bea7f71f4cdb97e0d84128" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" @@ -1420,7 +1420,6 @@ "google.golang.org/api/iterator", "google.golang.org/api/option", "google.golang.org/grpc", - "google.golang.org/grpc/credentials", "gopkg.in/yaml.v2", "k8s.io/api/admission/v1beta1", "k8s.io/api/admissionregistration/v1beta1", diff --git a/vendor/knative.dev/pkg/injection/sharedmain/main.go b/vendor/knative.dev/pkg/injection/sharedmain/main.go index 83dd0d250b..e25a066507 100644 --- a/vendor/knative.dev/pkg/injection/sharedmain/main.go +++ b/vendor/knative.dev/pkg/injection/sharedmain/main.go @@ -29,7 +29,6 @@ import ( "go.opencensus.io/stats/view" "golang.org/x/sync/errgroup" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/rest" @@ -326,29 +325,13 @@ func WatchObservabilityConfigOrDie(ctx context.Context, cmw *configmap.InformedW if _, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(metrics.ConfigMapName(), metav1.GetOptions{}); err == nil { cmw.Watch(metrics.ConfigMapName(), - metrics.ConfigMapWatcher(component, SecretFetcher(ctx), logger), + metrics.UpdateExporterFromConfigMap(component, logger), profilingHandler.UpdateFromConfigMap) } else if !apierrors.IsNotFound(err) { logger.With(zap.Error(err)).Fatalf("Error reading ConfigMap %q", metrics.ConfigMapName()) } } -// SecretFetcher provides a helper function to fetch individual Kubernetes -// Secrets (for example, a key for client-side TLS). Note that this is not -// intended for high-volume usage; the current use is when establishing a -// metrics client connection in WatchObservabilityConfigOrDie. -func SecretFetcher(ctx context.Context) metrics.SecretFetcher { - // NOTE: Do not use secrets.Get(ctx) here to get a SecretLister, as it will register - // a *global* SecretInformer and require cluster-level `secrets.list` permission, - // even if you scope down the Lister to a given namespace after requesting it. Instead, - // we package up a function from kubeclient. - // TODO(evankanderson): If this direct request to the apiserver on each TLS connection - // to the opencensus agent is too much load, switch to a cached Secret. - return func(name string) (*corev1.Secret, error) { - return kubeclient.Get(ctx).CoreV1().Secrets(system.Namespace()).Get(name, metav1.GetOptions{}) - } -} - // ControllersAndWebhooksFromCtors returns a list of the controllers and a list // of the webhooks created from the given constructors. func ControllersAndWebhooksFromCtors(ctx context.Context, diff --git a/vendor/knative.dev/pkg/kmeta/map.go b/vendor/knative.dev/pkg/kmeta/map.go deleted file mode 100644 index fc1b9b0ac3..0000000000 --- a/vendor/knative.dev/pkg/kmeta/map.go +++ /dev/null @@ -1,54 +0,0 @@ -/* -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 kmeta - -// CopyMap makes a copy of the map. -func CopyMap(a map[string]string) map[string]string { - ret := make(map[string]string, len(a)) - for k, v := range a { - ret[k] = v - } - return ret -} - -// UnionMaps returns a map constructed from the union of `a` and `b`, -// where value from `b` wins. -func UnionMaps(a, b map[string]string) map[string]string { - out := make(map[string]string, len(a)+len(b)) - - for k, v := range a { - out[k] = v - } - for k, v := range b { - out[k] = v - } - return out -} - -// FilterMap creates a copy of the provided map, filtering out the elements -// that match `filter`. -// nil `filter` is accepted. -func FilterMap(in map[string]string, filter func(string) bool) map[string]string { - ret := make(map[string]string, len(in)) - for k, v := range in { - if filter != nil && filter(k) { - continue - } - ret[k] = v - } - return ret -} diff --git a/vendor/knative.dev/pkg/metrics/README.md b/vendor/knative.dev/pkg/metrics/README.md index 49d3969c9b..9a5e5a0840 100644 --- a/vendor/knative.dev/pkg/metrics/README.md +++ b/vendor/knative.dev/pkg/metrics/README.md @@ -94,8 +94,8 @@ statistics for a short period of time if not. **This is true today.** [Ensure this on an ongoing basis.](https://github.com/knative/pkg/issues/957) - [ ] Google to implement OpenCensus Agent configuration to match what they are - doing for Stackdriver now. (No public issue link because this should be - in Google's vendor-specific configuration.) + doing for Stackdriver now. (No public issue link because this shoud be in + Google's vendor-specific configuration.) - [ ] Document how to configure OpenCensus/OpenTelemetry Agent + Prometheus to achieve the current level of application visibility, and determine a long-term course for how to maintain this as a "bare minimum" supported diff --git a/vendor/knative.dev/pkg/metrics/config.go b/vendor/knative.dev/pkg/metrics/config.go index 1dd072d5be..8c24e788aa 100644 --- a/vendor/knative.dev/pkg/metrics/config.go +++ b/vendor/knative.dev/pkg/metrics/config.go @@ -86,10 +86,6 @@ type metricsConfig struct { // writing the metrics to the stats.RecordWithOptions interface. recorder func(context.Context, []stats.Measurement, ...stats.Options) error - // secretFetcher provides access for fetching Kubernetes Secrets from an - // informer cache. - secretFetcher SecretFetcher - // ---- OpenCensus specific below ---- // collectorAddress is the address of the collector, if not `localhost:55678` collectorAddress string @@ -160,10 +156,6 @@ func (mc *metricsConfig) record(ctx context.Context, mss []stats.Measurement, ro func createMetricsConfig(ops ExporterOptions, logger *zap.SugaredLogger) (*metricsConfig, error) { var mc metricsConfig - // We don't check if this is `nil` right now, because this is a transition step. - // Eventually, this should be a startup check. - mc.secretFetcher = ops.Secrets - if ops.Domain == "" { return nil, errors.New("metrics domain cannot be empty") } diff --git a/vendor/knative.dev/pkg/metrics/exporter.go b/vendor/knative.dev/pkg/metrics/exporter.go index f8c778b482..b34c60a9d1 100644 --- a/vendor/knative.dev/pkg/metrics/exporter.go +++ b/vendor/knative.dev/pkg/metrics/exporter.go @@ -29,10 +29,6 @@ var ( metricsMux sync.RWMutex ) -// SecretFetcher is a function (extracted from SecretNamespaceLister) for fetching -// a specific Secret. This avoids requiring global or namespace list in controllers. -type SecretFetcher func(string) (*corev1.Secret, error) - type flushable interface { // Flush waits for metrics to be uploaded. Flush() @@ -69,29 +65,17 @@ type ExporterOptions struct { // See https://github.com/knative/serving/blob/master/config/config-observability.yaml // for details. ConfigMap map[string]string - - // A lister for Secrets to allow dynamic configuration of outgoing TLS client cert. - Secrets SecretFetcher `json:"-"` } // UpdateExporterFromConfigMap returns a helper func that can be used to update the exporter // when a config map is updated. -// DEPRECATED: Callers should migrate to ConfigMapWatcher. func UpdateExporterFromConfigMap(component string, logger *zap.SugaredLogger) func(configMap *corev1.ConfigMap) { - return ConfigMapWatcher(component, nil, logger) -} - -// ConfigMapWatcher returns a helper func which updates the exporter configuration based on -// values in the supplied ConfigMap. This method captures a corev1.SecretLister which is used -// to configure mTLS with the opencensus agent. -func ConfigMapWatcher(component string, secrets SecretFetcher, logger *zap.SugaredLogger) func(*corev1.ConfigMap) { domain := Domain() return func(configMap *corev1.ConfigMap) { UpdateExporter(ExporterOptions{ Domain: domain, Component: component, ConfigMap: configMap.Data, - Secrets: secrets, }, logger) } } diff --git a/vendor/knative.dev/pkg/metrics/opencensus_exporter.go b/vendor/knative.dev/pkg/metrics/opencensus_exporter.go index 2a54f6c60c..2a947f9da4 100644 --- a/vendor/knative.dev/pkg/metrics/opencensus_exporter.go +++ b/vendor/knative.dev/pkg/metrics/opencensus_exporter.go @@ -14,14 +14,9 @@ limitations under the License. package metrics import ( - "crypto/tls" - "fmt" - "contrib.go.opencensus.io/exporter/ocagent" "go.opencensus.io/stats/view" "go.uber.org/zap" - "google.golang.org/grpc/credentials" - "k8s.io/apimachinery/pkg/api/errors" ) func newOpenCensusExporter(config *metricsConfig, logger *zap.SugaredLogger) (view.Exporter, error) { @@ -29,9 +24,7 @@ func newOpenCensusExporter(config *metricsConfig, logger *zap.SugaredLogger) (vi if config.collectorAddress != "" { opts = append(opts, ocagent.WithAddress(config.collectorAddress)) } - if config.requireSecure { - opts = append(opts, ocagent.WithTLSCredentials(credentialFetcher(config.component, config.secretFetcher, logger))) - } else { + if !config.requireSecure { opts = append(opts, ocagent.WithInsecure()) } e, err := ocagent.NewExporter(opts...) @@ -43,36 +36,3 @@ func newOpenCensusExporter(config *metricsConfig, logger *zap.SugaredLogger) (vi view.RegisterExporter(e) return e, nil } - -// credentialFetcher attempts to locate a secret containing TLS credentials -// for communicating with the OpenCensus Agent. To do this, it first looks -// for a secret named "-opencensus", then for a generic -// "opencensus" secret. -func credentialFetcher(component string, lister SecretFetcher, logger *zap.SugaredLogger) credentials.TransportCredentials { - if lister == nil { - logger.Errorf("No secret lister provided for component %q; cannot use requireSecure=true", component) - return nil - } - return credentials.NewTLS(&tls.Config{ - GetClientCertificate: func(*tls.CertificateRequestInfo) (*tls.Certificate, error) { - // We ignore the CertificateRequestInfo for now, and hand back a single fixed certificate. - // TODO(evankanderson): maybe do something SPIFFE-ier? - cert, err := certificateFetcher(component+"-opencensus", lister) - if errors.IsNotFound(err) { - cert, err = certificateFetcher("opencensus", lister) - } - if err != nil { - return nil, fmt.Errorf("Unable to fetch opencensus secret for %q, cannot use requireSecure=true: %+v", component, err) - } - return &cert, err - }, - }) -} - -func certificateFetcher(secretName string, lister SecretFetcher) (tls.Certificate, error) { - secret, err := lister(secretName) - if err != nil { - return tls.Certificate{}, err - } - return tls.X509KeyPair(secret.Data["client-cert.pem"], secret.Data["client-key.pem"]) -} diff --git a/vendor/knative.dev/pkg/metrics/testdata/README.md b/vendor/knative.dev/pkg/metrics/testdata/README.md deleted file mode 100644 index 12444d6e26..0000000000 --- a/vendor/knative.dev/pkg/metrics/testdata/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# Test files for metrics - -The cert files were generated with: - -```shell -openssl req -x509 -nodes -newkey dsa:<(openssl dsaparam 1024) -keyout client-key.pem -out client-cert.pem -days 10000 -``` - -Note that there are some manual prompts later in the process. This seemed simpler than generating the certs in Go. - -To view the cert: -```shell -openssl x509 -noout -text -in client-cert.pem -``` diff --git a/vendor/knative.dev/pkg/metrics/testdata/client-cert.pem b/vendor/knative.dev/pkg/metrics/testdata/client-cert.pem deleted file mode 100644 index 6f0cacf70e..0000000000 --- a/vendor/knative.dev/pkg/metrics/testdata/client-cert.pem +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfDCCAjoCCQDJUTmi/6JoGDALBglghkgBZQMEAwIwIjEgMB4GA1UEAwwXdGVz -dC1jbGllbnQuZXhhbXBsZS5jb20wHhcNMjAwMjE0MTg1OTE2WhcNNDcwNzAyMTg1 -OTE2WjAiMSAwHgYDVQQDDBd0ZXN0LWNsaWVudC5leGFtcGxlLmNvbTCCAbYwggEr -BgcqhkjOOAQBMIIBHgKBgQCEMFcdoo8FsDPTY5lupaggF7LrvxEKYOKR+wSug9uk -mzreh3KtfJW2YseHUmjqafd367//Ych7gJim8UTEkdjZEfFKK8iRLTRyjNwK0KRb -1JqL4qT9wmNpsrZ90KDX3xaJukbOZHumlb5AmJXD1RGSjnSaWqLzuXxmvVVkPnhe -AwIVAMj19ML2hIr0O6cqiQg3Zmh/It/VAoGAfLoW+TmD6JAJyxtp7QMVujbP/OY+ -jV4wwekXBzgZITUWupC0ULtMY+6VLPvS6Up0mnnZxgVFnABpvoCqrc+tG1p7Lnyi -2XG9AQ1V9JMRTjerQoDGCS/kMDD7jx37N59tkq6sJ+XYFOVSjfAlRTmW6wV1DpUW -m7olKlj6mEL3qI0DgYQAAoGACz1U5FNb5ANwgcc70dvRU0PrBs9HEZd+jaH7yfBV -g9Eas6aBAx5yAHK6g3tYvI9dzVUgZZmKgEspNsjusB1cnSBBVa7YxlCKn6MZB523 -5+8KnKFMtOYMivRM19Dr+bBvvCkwOc37PJREcCrmddN1OWAM1sEinwxWINumktLO -QmkwCwYJYIZIAWUDBAMCAy8AMCwCFGjZ2Hc70n9AanALEmAaOCZ5yCJ6AhQXyIXt -4m9Fu8NFOK5qJYhxxDOp9Q== ------END CERTIFICATE----- diff --git a/vendor/knative.dev/pkg/metrics/testdata/client-key.pem b/vendor/knative.dev/pkg/metrics/testdata/client-key.pem deleted file mode 100644 index 09fce9d08f..0000000000 --- a/vendor/knative.dev/pkg/metrics/testdata/client-key.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIBSgIBADCCASsGByqGSM44BAEwggEeAoGBAIQwVx2ijwWwM9NjmW6lqCAXsuu/ -EQpg4pH7BK6D26SbOt6Hcq18lbZix4dSaOpp93frv/9hyHuAmKbxRMSR2NkR8Uor -yJEtNHKM3ArQpFvUmovipP3CY2mytn3QoNffFom6Rs5ke6aVvkCYlcPVEZKOdJpa -ovO5fGa9VWQ+eF4DAhUAyPX0wvaEivQ7pyqJCDdmaH8i39UCgYB8uhb5OYPokAnL -G2ntAxW6Ns/85j6NXjDB6RcHOBkhNRa6kLRQu0xj7pUs+9LpSnSaednGBUWcAGm+ -gKqtz60bWnsufKLZcb0BDVX0kxFON6tCgMYJL+QwMPuPHfs3n22Srqwn5dgU5VKN -8CVFOZbrBXUOlRabuiUqWPqYQveojQQWAhRn0IIk7GKtluNxnlqYpCuNazN6gQ== ------END PRIVATE KEY----- diff --git a/vendor/knative.dev/pkg/metrics/testdata/server-cert.pem b/vendor/knative.dev/pkg/metrics/testdata/server-cert.pem deleted file mode 100644 index 22935c1ae6..0000000000 --- a/vendor/knative.dev/pkg/metrics/testdata/server-cert.pem +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICwDCCAagCCQCenPDbJ3W+6zANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBd0 -ZXN0LXNlcnZlci5leGFtcGxlLmNvbTAeFw0yMDAyMTQyMDEyMzBaFw0yMjExMTAy -MDEyMzBaMCIxIDAeBgNVBAMMF3Rlc3Qtc2VydmVyLmV4YW1wbGUuY29tMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4OIOJdBv2mxvSI3izpUu/RL5ND5 -9IQ1hM5UDCnH2UifweWSEePXDnJgqi8563+gzQHMTN/BBNR4HiIbUulq1KDZjYKE -7FtT8PCE8XXwTxieyV/uiIlfd0b74NcSvuayKzGwOZ2h44kU/n8hZ5ubwmS1Dlir -jCcJtFK3zcqnjqhmjqgj6gZJA/v5ipEnO78+kWU37XvRAGbfaK1/NzyENozg52q7 -OhFeVci2SEvn0gE0XC0jbgKFRvaZtMEhfwkggaUYv122btHntP5/Y4iNzxllDocD -h6GxXqgbnopdrDEscEbObJc6FJtUvHtMF1lnM2SMXWdMCueUvGUFLGxAqwIDAQAB -MA0GCSqGSIb3DQEBCwUAA4IBAQBiMAv5lL+jwUgEeaVn7B9Uma3nyW3yAOce6j2/ -7ADR4KNNomEzrEJuH67FQNQQj8CkNMtjSsHEwhLrDlkE6SKhZn1ikNw36+5DDa0o -42Dzv/UrUUY0dJc1KB6Sro4K0k/ivNWHXe+cdCbqbrZk29QXUVAnBiqJ3r3VWOMG -6lgO9kV6Dr5M7RnEOtNT7Dfr7/T817vXODZqa830J8XrM6e2znSB2QVTgswQ0HTf -K3SObMYeZc76hg/yOUzdinBMRjZ/Op/a9oE5W71YS3aG/t2v8b2Z2gwIBR4Sa+cr -y4VcW99RLXlzjtTCKnVvX9sRLFBZa96Rslm0nFWzbz40umaD ------END CERTIFICATE----- diff --git a/vendor/knative.dev/pkg/metrics/testdata/server-key.pem b/vendor/knative.dev/pkg/metrics/testdata/server-key.pem deleted file mode 100644 index fe9d9006e7..0000000000 --- a/vendor/knative.dev/pkg/metrics/testdata/server-key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDHg4g4l0G/abG9 -IjeLOlS79Evk0Pn0hDWEzlQMKcfZSJ/B5ZIR49cOcmCqLznrf6DNAcxM38EE1Hge -IhtS6WrUoNmNgoTsW1Pw8ITxdfBPGJ7JX+6IiV93Rvvg1xK+5rIrMbA5naHjiRT+ -fyFnm5vCZLUOWKuMJwm0UrfNyqeOqGaOqCPqBkkD+/mKkSc7vz6RZTfte9EAZt9o -rX83PIQ2jODnars6EV5VyLZIS+fSATRcLSNuAoVG9pm0wSF/CSCBpRi/XbZu0ee0 -/n9jiI3PGWUOhwOHobFeqBueil2sMSxwRs5slzoUm1S8e0wXWWczZIxdZ0wK55S8 -ZQUsbECrAgMBAAECggEAIp6kSI2WjwxcFyGU2cfpZCPj93R7qv41+zGCTAoD76Q2 -dILNceVDL/KQ63b+aerfkDM7rCs3ZwsnPLNWYnC2ZOb0WSXIwuqmCizyJKP+avsu -smq/DVopAp2Cn2Uyj4WgbPZWSekcaksjJXYR6dSKlpS7Bh5ExjEP8gZYdpEvugUY -LOnenhrHJ+eGI1nQ5Sb2fuAOXyM6UYPw0H4d8s/2xwe8fzgOUO8v4PAYPnA6M/R/ -Y/p6qIuRzEuHwqYuTZ7S1g9UG5hW0HaEuMaQZM9UtK2PxfEP3WHPJZ8zjIVgLhIf -yjPWo4s9X477NURYX9R2JeoLgea5sYCgqXvsSSvA4QKBgQDpqxjP8NxC0KwtonvS -08EtUwGZaPQ9aROVBqa5u4BLyJ+YwBbBt2DlWTSKJ1eDC9olaca1/pRPxysS4N7x -CieZkFES3sS0oaLssh+BQ4VsvvkkBdsdcWAcK6Joj7uIjlEfl72hJq8mUeR14gyy -G2wE/sZ1m5wopqItGjcuR4qd5wKBgQDalNBaAcbyD1K415sh0uFCujwPoh5ezr4f -VNBUL1VaOBztOyAp7szoo/lyfMpq+6tCn1X61DtHyBJkM3fp9IpaQpc9AnHfedx4 -0iwispzkpGFY0S88HZotB3oxN9kU+Ll3/i7unXqPmbxNEEoYlZ3UJmLOiqKgdccc -qv2I+toGnQKBgDT9Vf0h8/E6/TDEHixrVO2AW2Z8xJaAk65B+eE4whltf7PWK9L2 -UQTxu9ZwoYnYUDoXyLZQ6zVER2JamHQ1B1HtxlTvK9CCrz3aDwbzVviYPkuLAGum -4FLDGmt33OFU1NTDRn+bFDEudQ6+mn5xdYeUd1EIXtthHnn37feSxb6VAoGAXLZ+ -YY8baZTiS5D4NjKSZZFE5ISpSSF8NyHsc6jYFTpz2pQXonGt7IeQyOTxnss86zdW -atwWgO32DxZdqJiXDo3sRG6DCn1P7NeI7PbB4aFvwRKJbIBJ4wum4rWDmIefc6wX -EBMv5zUYT7+3DhJ4LYJSqrTXIiSS3jAQ9kcgr2kCgYBE8W+Nx4stlLlQ3EpocikZ -D2GcFyTE0TfZf82NV9uPkDXZ8vYQQ9NEIn+crY1gC3edknMXJ5v1IUaRacxQPp2C -0UewG3HQqgybhq2wvnMrw+dJqo2vuOInDZAC/Zvv+RGXtc3H+v6o875n3TYOro67 -P4jKdY+Mxl3BLvI6KhJJrA== ------END PRIVATE KEY----- diff --git a/vendor/knative.dev/pkg/test/logging/logging.go b/vendor/knative.dev/pkg/test/logging/logging.go index ace6446994..f3b2c5ddf3 100644 --- a/vendor/knative.dev/pkg/test/logging/logging.go +++ b/vendor/knative.dev/pkg/test/logging/logging.go @@ -23,7 +23,6 @@ import ( "context" "flag" "os" - "strconv" "strings" "sync" "time" @@ -33,7 +32,6 @@ import ( "go.opencensus.io/trace" "go.uber.org/zap" "go.uber.org/zap/zapcore" - "k8s.io/klog" ) const ( @@ -121,7 +119,7 @@ func InitializeMetricExporter(context string) { } func printFlags() { - var flagList []interface{} + flagList := make([]interface{}, 0) flag.CommandLine.VisitAll(func(f *flag.Flag) { flagList = append(flagList, f.Name, f.Value.String()) }) @@ -137,7 +135,7 @@ var ( // InitializeLogger initializes logging for Knative tests. // It should be called prior to executing tests but after command-line flags have been processed. -// It is recommended doing it in the TestMain() function. +// Recommend doing it in a TestMain(). func InitializeLogger() { loggerInitializeOnce.Do(func() { humanEncoder := zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig()) @@ -161,10 +159,6 @@ func InitializeLogger() { logger = zap.New(zapCore) zap.ReplaceGlobals(logger) // Gets used by klog/glog proxy libraries - // Set klog/glog verbosities (works with and without proxy libraries) - klogLevel := klog.Level(0) - klogLevel.Set(strconv.Itoa(verbosity)) - if verbosity > 2 { printFlags() }