From d1969f47343b6519f2077de40209b9317fec5316 Mon Sep 17 00:00:00 2001 From: mattmoor-sockpuppet Date: Wed, 18 Sep 2019 09:37:47 -0700 Subject: [PATCH] Auto-update dependencies (#103) Produced via: `dep ensure -update knative.dev/test-infra knative.dev/pkg` /assign mattmoor --- Gopkg.lock | 6 +++--- vendor/knative.dev/pkg/Gopkg.lock | 4 ++-- vendor/knative.dev/pkg/injection/sharedmain/main.go | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 4c302f9f..8372cae0 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -927,7 +927,7 @@ [[projects]] branch = "master" - digest = "1:3c7d420e299c96fab540a977299b43f1606b9d16b0593e7083c84345dcbde5bf" + digest = "1:9c5f27ee00497a71cec253447cf4c6c89e2a5cbd233c861bdac64ca53080b4db" name = "knative.dev/pkg" packages = [ "apis", @@ -946,7 +946,7 @@ "metrics/metricskey", ] pruneopts = "T" - revision = "5cdf30f51ef152232da0e56ef39d35de6c057f3d" + revision = "24f524cb25af0f824ad227a1726affc9c2a58ba9" [[projects]] branch = "master" @@ -957,7 +957,7 @@ "tools/dep-collector", ] pruneopts = "UT" - revision = "efad44559f944cfc58dc5bca076eeb3ec20fb346" + revision = "cf182a6717e1c5ad95da9a6098ead41c076428f5" [solve-meta] analyzer-name = "dep" diff --git a/vendor/knative.dev/pkg/Gopkg.lock b/vendor/knative.dev/pkg/Gopkg.lock index af41d073..af36da71 100644 --- a/vendor/knative.dev/pkg/Gopkg.lock +++ b/vendor/knative.dev/pkg/Gopkg.lock @@ -1245,14 +1245,14 @@ [[projects]] branch = "master" - digest = "1:615f3c6b974179c583edf50234fd87c5731d02ef941f314cbd4dd2766d3a619a" + digest = "1:964a4f9e12d5021b9d550e04c36cf23feb880e286ceede1b246d5c0e43b523b9" name = "knative.dev/test-infra" packages = [ "scripts", "tools/dep-collector", ] pruneopts = "UT" - revision = "816123d5e71fb88533d1564c331443387967e1dc" + revision = "efad44559f944cfc58dc5bca076eeb3ec20fb346" [[projects]] digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" diff --git a/vendor/knative.dev/pkg/injection/sharedmain/main.go b/vendor/knative.dev/pkg/injection/sharedmain/main.go index f924fbf7..b712a510 100644 --- a/vendor/knative.dev/pkg/injection/sharedmain/main.go +++ b/vendor/knative.dev/pkg/injection/sharedmain/main.go @@ -32,6 +32,7 @@ import ( "k8s.io/client-go/tools/clientcmd" "go.uber.org/zap" + apierrors "k8s.io/apimachinery/pkg/api/errors" kubeclient "knative.dev/pkg/client/injection/kube/client" "knative.dev/pkg/configmap" "knative.dev/pkg/controller" @@ -77,7 +78,11 @@ func GetConfig(masterURL, kubeconfig string) (*rest.Config, error) { func GetLoggingConfig(ctx context.Context) (*logging.Config, error) { loggingConfigMap, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(logging.ConfigMapName(), metav1.GetOptions{}) if err != nil { - return nil, err + if apierrors.IsNotFound(err) { + return logging.NewConfigFromMap(make(map[string]string)) + } else { + return nil, err + } } return logging.NewConfigFromConfigMap(loggingConfigMap)