Skip to content

Commit

Permalink
Bump the version of knative/pkg to something much more recent.
Browse files Browse the repository at this point in the history
We're a few months behind and are missing quite a few bug fixes and performance improvements.
  • Loading branch information
dlorenc authored and Dan Lorenc committed Jun 17, 2019
1 parent 3f87c83 commit 490aa98
Show file tree
Hide file tree
Showing 80 changed files with 4,790 additions and 1,125 deletions.
24 changes: 16 additions & 8 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,23 @@ required = [

[[override]]
name = "github.com/knative/pkg"
# HEAD as of 2019-04-09 💖
revision = "28cfa161499b88cc5a71cfb7cf8a59fc34bff3d3"
# HEAD as of 2019-06-14 💖
revision = "68737b1b4e03d9a888e89ee2a44714a56eefd539"

[[override]]
name = "go.uber.org/zap"
revision = "67bc79d13d155c02fd008f721863ff8cc5f30659"

[[override]]
name = "contrib.go.opencensus.io/exporter/stackdriver"
# HEAD as of 2019-02-11
# Needed because this includes a fix to support Stackdriver built-in metrics
revision = "c06c82c832edca4eaf7b0241bd655560a1be0346"

[[override]]
name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.12.6"

[prune]
go-tests = true
unused-packages = true
Expand Down
6 changes: 3 additions & 3 deletions pkg/logging/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@ func NewLoggerFromConfig(config *logging.Config, name string) (*zap.SugaredLogge

// NewConfigFromMap creates a LoggingConfig from the supplied map
func NewConfigFromMap(data map[string]string) (*logging.Config, error) {
return logging.NewConfigFromMap(data, components...)
return logging.NewConfigFromMap(data)
}

// NewConfigFromConfigMap creates a LoggingConfig from the supplied ConfigMap
func NewConfigFromConfigMap(configMap *corev1.ConfigMap) (*logging.Config, error) {
return logging.NewConfigFromConfigMap(configMap, components...)
return logging.NewConfigFromConfigMap(configMap)
}

// UpdateLevelFromConfigMap returns a helper func that can be used to update the logging level
// when a config map is updated
func UpdateLevelFromConfigMap(logger *zap.SugaredLogger, atomicLevel zap.AtomicLevel, levelKey string) func(configMap *corev1.ConfigMap) {
return logging.UpdateLevelFromConfigMap(logger, atomicLevel, levelKey, components...)
return logging.UpdateLevelFromConfigMap(logger, atomicLevel, levelKey)
}
2 changes: 1 addition & 1 deletion pkg/reconciler/v1alpha1/pipelinerun/pipelinerun.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func NewController(
timeoutHandler: timeoutHandler,
}

impl := controller.NewImpl(r, r.Logger, pipelineRunControllerName, reconciler.MustNewStatsReporter(pipelineRunControllerName, r.Logger))
impl := controller.NewImpl(r, r.Logger, pipelineRunControllerName)

r.Logger.Info("Setting up event handlers")
pipelineRunInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/v1alpha1/taskrun/taskrun.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func NewController(
resourceLister: resourceInformer.Lister(),
timeoutHandler: timeoutHandler,
}
impl := controller.NewImpl(c, c.Logger, taskRunControllerName, reconciler.MustNewStatsReporter(taskRunControllerName, c.Logger))
impl := controller.NewImpl(c, c.Logger, taskRunControllerName)

c.Logger.Info("Setting up event handlers")
taskRunInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
Expand Down
33 changes: 33 additions & 0 deletions third_party/VENDOR-LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2731,6 +2731,39 @@ Import: github.com/tektoncd/pipeline/vendor/github.com/google/gofuzz



===========================================================
Import: github.com/tektoncd/pipeline/vendor/github.com/google/uuid

Copyright (c) 2009,2014 Google Inc. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



===========================================================
Import: github.com/tektoncd/pipeline/vendor/github.com/googleapis/gax-go

Expand Down
19 changes: 14 additions & 5 deletions vendor/contrib.go.opencensus.io/exporter/stackdriver/metrics.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 57 additions & 15 deletions vendor/contrib.go.opencensus.io/exporter/stackdriver/stats.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions vendor/github.com/google/go-cmp/cmp/cmpopts/ignore.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 490aa98

Please sign in to comment.